m

youxiw2000
1 parent 3441161d
Showing 51 changed files with 3930 additions and 6989 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
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/src/api/caseOfflineInfo.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/company_credit.js
trash-ui/src/api/construction_credit.js
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/dict.js
trash-ui/src/api/driver_credit.js
trash-ui/src/api/earthsites_credit.js
trash-ui/src/api/leave.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/truck_credit.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/warningInfo.js
trash-ui/src/views/activiti/task/constructsiteInfo.vue
trash-ui/src/views/activiti/task/index.vue
@@ -291,8 +291,8 @@ public class ActTaskServiceImpl implements IActTaskService {
             taskRuntime.complete(TaskPayloadBuilder.complete().withTaskId(taskID).build());
         }
-
-        updateThreesetpTask(processInstance, desc);
+        if(desc != null)
+        	updateThreesetpTask(processInstance, desc);
         // 写入数据库
@@ -309,7 +309,8 @@ public class ActTaskServiceImpl implements IActTaskService {
 		task.setDescription(placeCode);
-		if(processInstance.getProcessDefinitionKey().equals("workflow_leave") || processInstance.getProcessDefinitionKey().equals("workflow_caseoffline") ||
+		if(processInstance.getProcessDefinitionKey().equals("workflow_conract") || 
+				processInstance.getProcessDefinitionKey().equals("workflow_leave") || processInstance.getProcessDefinitionKey().equals("workflow_caseoffline") ||
 				processInstance.getProcessDefinitionKey().equals("logistics") || processInstance.getProcessDefinitionKey().equals("conference")
 				|| processInstance.getProcessDefinitionKey().equals("workflow_threestep") || processInstance.getProcessDefinitionKey().equals("workflow_casefile")
                 || processInstance.getProcessDefinitionKey().equals("handleAffairs") || processInstance.getProcessDefinitionKey().equals("gongwenchuli")){
@@ -29,7 +29,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://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
 package com.trash.common.utils;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -57,6 +58,10 @@ public class RemoteServerUtils {
 	public static String UpdateEarthSiteRequestPath = "/api/siteservice/cs/earthsites/status";
 	public static String UpdateConractRequestPath = "/api/siteservice/cs/sitecontract/audit/status";
+	
+	public static String DriverListPath = "/api/gpsservice/v1/drivers/search";
+	
+	
 	public static String BasevehicleInfo = "/api/gpsservice/cs/basevehicle/";
@@ -594,5 +599,41 @@ public class RemoteServerUtils {
 	}
+	public static JSONArray getDriverList(String token) {
+	
+		if(okHttpClient == null){
+			okHttpClient = new OkHttpClient.Builder()
+	                .connectTimeout(20, TimeUnit.SECONDS)
+	                .writeTimeout(20, TimeUnit.SECONDS)
+	                .readTimeout(30, TimeUnit.SECONDS)
+	                .build();
+		}
+
+    	token = "Bearer "+ token;
+    				
+    	String param = JSON.toJSON(new HashMap<>()).toString();
+    	
+    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
+
+        Request request = new Request.Builder().url(remote+DriverListPath).addHeader("Authorization",token ).post(body).build();
+
+        try {
+            okhttp3.Response response = okHttpClient.newCall(request).execute();
+            String result = response.body().string();
+            
+            if(result != null){
+            	JSONObject json = JSON.parseObject(result);
+            	return json.getJSONArray("list");
+            	
+            }else{
+            	return null;
+            }
+            
+        }catch (Exception e) {
+        	e.printStackTrace();
+        	return null;
+		}
+	}
+
 }
@@ -26,10 +26,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.activiti.service.IActTaskService;
 import com.trash.business.domain.CompanyCredit;
+import com.trash.business.domain.DriverCredit;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.TruckCredit;
 import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.service.ICompanyCreditService;
+import com.trash.business.service.IDriverCreditService;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
 import com.trash.business.service.ITruckCreditService;
@@ -130,8 +132,44 @@ public class DriverTask
 	}
+    
 	private void checkDriverCredit() {
+    	if(RemoteServerUtils.remote == null){
+    		RemoteServerUtils.remote = trashConfig.getRemotePath();
+    	}
+    	if(TOKEN == null){
+    		TOKEN = trashConfig.getToken();
+    	}
+
+        JSONArray drivers = RemoteServerUtils.getDriverList(TOKEN);
+        
+        
+        for(Object object :drivers){
+        	
+        	JSONObject json = (JSONObject)object;
+        	
+			try {
+				if(sdf.parse(json.getString("endAt")).getTime() < sdf.parse(sdf.format(new Date())).getTime() || 
+						sdf.parse(json.getString("qualificationCertValidEndAt")).getTime() < sdf.parse(sdf.format(new Date())).getTime()){
+					DriverCredit driver = new DriverCredit();
+					
+					driver.setIdNumber(json.getString("identityNo"));
+					driver.setName(json.getString("name"));
+					driver.setCreateBy("定时器");
+					driver.setReason("证件过期");
+					driver.setTime(new Date());
+					driver.setStatus(0L);
+					
+
+					SpringUtils.getBean(IDriverCreditService.class).insertDriverCredit(driver);
+				}
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+        	
+        }
 	}
+import { listCaseOffline, getCaseOffline,getAdviceList } from "@/api/caseOffline/caseOffline";
+  import {
+    getArea,
+    earthsitesList,
+    constructionsitesList,
+    getDict,
+
+  } from "@/api/dict";
+  import {
+    getThreestep,
+  } from "@/api/business/threestep";
+
+
+
+  import {
+    getToken
+  } from "@/utils/auth";
+export default {
+  name: "CaseOffline",
+  props: {
+    businessKey: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 线下交办案卷表格数据
+      caseOfflineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      open2:false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+        place: null,
+        createTime: null,
+      },
+      uploadImageDialog:false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      caseType:[
+        {code:0,name:"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥"},
+        {code:1,name:"未洗车出场或者出场清洁不彻底"},
+        {code:2,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
+        {code:3,name:"非核准车辆进入渣土处置工地运输渣土"},
+        {code:4,name:"渣土处置工地未按规定时间开停工"},
+        {code:5,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
+        {code:6,name:"渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
+        {code:7,name:"其他1"},
+        {code:8,name:"其他2"},
+        {code:9,name:"其他3"}
+      ],
+      areas:null,
+      fileList:[],
+      areas: [],
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {
+          Authorization: "Bearer " + getToken()
+        },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
+
+      },
+      workflow:"workflow_caseoffline",
+      data:{},
+      adviceList:[],
+    };
+  },
+  created() {
+    getArea().then(res=>{
+      this.areas = res.result;
+      this.handleUpdate();
+    });
+  },
+  methods: {
+    getSite(item){
+      this.form.objectId = item.id;
+    },
+
+   getAreaName(code){
+     for(let i =0;i<this.areas.length;i++){
+       if(Number(code) == this.areas[i].code){
+         return this.areas[i].name;
+         break;
+       }
+     }
+     return code;
+   },
+    getCaseType(type){
+      for(let i in this.caseType){
+        if(this.caseType[i].code==Number(type))
+          return this.caseType[i].name
+      }
+    },
+
+      downloadFile(path) {
+        window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+      },
+    /** 修改按钮操作 */
+    handleUpdate() {
+      let id;
+      if(this.businessKey.split(":").length == 2){
+        id = this.businessKey.split(":")[1];
+      }else{
+        id = this.businessKey;
+      }
+
+      getCaseOffline(id).then(response => {
+        this.form = response.data;
+        if(this.form.attach && this.form.attach != "")
+          this.form.attach  = this.form.attach.split(",");
+
+        this.form.siteType = this.form.siteType + "";
+        this.form.type = this.getCaseType(this.form.type);
+        this.form.place = this.getAreaName(this.form.place);
+
+        getAdviceList(this.workflow+":"+id).then(res=>{
+            if(res.data){
+              if(res.data.advice1){
+                this.adviceList.push({name: res.data.advice1.create_by ,time:res.data.advice1.create_time,text:this.form.advice1})
+              }
+              if(res.data.advice2){
+                this.adviceList.push({name: res.data.advice2.create_by ,time:res.data.advice2.create_time,text:this.form.advice2})
+              }
+              if(res.data.advice3){
+                this.adviceList.push({name: res.data.advice3.create_by ,time:res.data.advice3.create_time,text:this.form.advice3})
+              }
+              if(res.data.advice4){
+                this.adviceList.push({name: res.data.advice4.create_by ,time:res.data.advice4.create_time,text:this.form.advice4})
+              }
+
+            }
+        });
+
+
+        this.open2 = true;
+      });
+
+
+    },
+  }
+};
+import { listCaseOffline, getCaseOffline, delCaseOffline, addCaseOffline, updateCaseOffline, exportCaseOffline } from "@/api/caseOffline/caseOffline";
+
+
+import h5Info from "@/views/h5/caseOffline/caseOfflineInfo";
+
+import h5page from '@/views/h5/Pagination';
+
+
+
+  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
+  import {
+    getArea,
+    earthsitesList,
+    constructionsitesList,
+    getDict,
+  } from "@/api/dict";
+  import {
+    getThreestep,
+  } from "@/api/business/threestep";
+
+  import {
+    getToken
+  } from "@/utils/auth";
+export default {
+  name: "CaseOffline",
+
+  components: {
+    caseOfflineInfo,
+    h5Info,
+    h5page
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 线下交办案卷表格数据
+      caseOfflineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      open2:false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+        place: null,
+        createTime: null,
+        isAsc:"DESC",
+        orderByColumn:"createTime"
+      },
+      uploadImageDialog:false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      caseType:[
+        {code:0,name:"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥"},
+        {code:1,name:"未洗车出场或者出场清洁不彻底"},
+        {code:2,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
+        {code:3,name:"非核准车辆进入渣土处置工地运输渣土"},
+        {code:4,name:"渣土处置工地未按规定时间开停工"},
+        {code:5,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
+        {code:6,name:"渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
+        {code:7,name:"其他1"},
+        {code:8,name:"其他2"},
+        {code:9,name:"其他3"}
+      ],
+      areas:null,
+      fileList:[],
+      areas: [],
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {
+          Authorization: "Bearer " + getToken()
+        },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
+      },
+      data:{},
+      objId:null
+    };
+  },
+  created() {
+
+
+
+    this.getList();
+
+      if(window.location.search){
+        let businessKey = window.location.search.split("=")[1];
+          debugger;
+        if(window.location.search.split("=")[0] == "?businessKey"){
+          let id;
+          if(businessKey.split(":").length == 2){
+              id = businessKey.split(":")[1];
+            }else{
+              id = businessKey;
+            }
+
+            getThreestep(id).then(response => {
+              let data = response.data;
+
+              this.handleAdd();
+
+              this.form.siteType = data.type + "";
+              this.form.siteName = data.name;
+              this.form.place = Number(data.place);
+            });
+        }
+
+      }
+
+
+
+    let remoteQueryData = {
+      "page": 1,
+      "size": 9999
+    }
+
+    constructionsitesList(remoteQueryData).then(res => {
+       this.data[0]= res.result.list;
+    });
+
+    earthsitesList(remoteQueryData).then(res => {
+        this.data[1]= res.result.list;
+    });
+  },
+  methods: {
+    getSite(item){
+      this.form.objectId = item.id;
+    },
+    /** 查询线下交办案卷列表 */
+    getList() {
+      this.loading = true;
+      listCaseOffline(this.queryParams).then(response => {
+        this.caseOfflineList = response.rows;
+
+        for(let i in this.caseOfflineList){
+          this.caseOfflineList[i].type = this.getCaseType(Number(this.caseOfflineList[i].type));
+
+        }
+
+        getArea().then(res => {
+            this.areas = res.result;
+            for(let i =0;i< this.caseOfflineList.length;i++){
+              this.caseOfflineList[i].place = this.getAreaName(this.caseOfflineList[i].place);
+            }
+          });
+
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.open2 = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        type: null,
+        siteName: null,
+        locationDec: null,
+        caseDec: null,
+        status: 0,
+        place: null,
+        number: null,
+        siteType: null,
+        objectId: null,
+        createTime: null,
+        createBy: null,
+        advice1: null,
+        advice2: null,
+        advice3: null,
+        advice4: null,
+          attach:[]
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+   getAreaName(code){
+     for(let i =0;i<this.areas.length;i++){
+       if(Number(code) == this.areas[i].code){
+         return this.areas[i].name;
+         break;
+       }
+     }
+     return code;
+   },
+    getCaseType(type){
+      for(let i in this.caseType){
+
+
+        if(this.caseType[i].code==type)
+          return this.caseType[i].name
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加线下交办案卷";
+
+      let date = new Date();
+
+
+      this.form.number = date.getFullYear()
+                          +""+((date.getMonth()+1) < 10 ? "0" + (date.getMonth()+1) : (date.getMonth()+1))
+                          +""+ ((date.getDate()) < 10 ? "0" + (date.getDate()) : (date.getDate()))
+                          +""+ ((date.getHours()) < 10 ? "0" + (date.getHours()) : (date.getHours()))
+                          +""+ ((date.getMinutes()) < 10 ? "0" + (date.getMinutes()) : (date.getMinutes()))
+                          +""+ ((date.getSeconds()) < 10 ? "0" + (date.getSeconds()*1000) : (date.getSeconds()*1000))
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.businessKey =row.id + "";
+      this.open2 = true;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.attach  = this.form.attach +"";
+          if (this.form.id != null) {
+            updateCaseOffline(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCaseOffline(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除线下交办案卷编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCaseOffline(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有线下交办案卷数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportCaseOffline(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+    },
+    removeAttchItem(index, img) {
+      this.form.attach.splice(this.form.attach.indexOf(img), 1);
+      this.$forceUpdate();
+    },
+    uploadSuccess(res, file, fileList) {
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
+      if(!this.form.attach){
+        this.form.attach = [];
+      }
+      this.form.attach.push(res);
+    },
+    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;
+      }
+      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 (!isAccept) {
+        this.$message.error('应该选择PDF、JPG、WORD类型的文件')
+        return isAccept;
+      }
+    },
+      downloadFile(path) {
+        window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+      },
+      handleClose() {
+        this.uploadImageDialog = false;
+        this.fileList = [];
+      },
+  }
+};
+  import {
+    listCredit,
+    getCredit,
+    delCredit,
+    addCredit,
+    updateCredit,
+    exportCredit,
+    getNames,
+    getPlaces,
+    historyCredit
+  } from "@/api/business/company";
+
+  import {
+    companyList,
+    updateCompany,
+  } from "@/api/dict";
+
+
+  export default {
+    name: "Credit",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        infoDialog :false,
+        // 总条数
+        total: 0,
+        // 工地表格数据
+        creditList: [],
+        creditListInfo: [],
+        companyList:[],
+        dictNames:[],
+        dictPlaces:[],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        isEdit:false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          name: null,
+          time: null,
+          place: null,
+          reason: null,
+          status: 0,
+          lostCredit: 1
+        },
+        // 表单参数
+        form: {},
+        updateForm:{},
+        // 表单校验
+        rules: {
+          name: [
+            { required: true, message: '请选择运输企业', trigger: 'change' },
+          ],
+          reason: [
+            { required: true, message: '请填写原因', trigger: 'change' },
+          ],
+        },
+        rules2: {
+          reason: [
+            { required: true, message: '请填写原因', trigger: 'change' },
+          ],
+        },
+      };
+    },
+    created() {
+      this.init();
+    },
+    methods: {
+      init(){
+        this.resetQuery();
+          this.getList();
+          getNames(this.queryParams).then(response => {
+            this.dictNames = response;
+          });
+          getPlaces(this.queryParams).then(response => {
+            this.dictPlaces = response;
+          });
+
+          let query = {
+            'page':1,
+            'size':9999,
+            'creditStatus':0
+          }
+          companyList(query).then(response => {
+
+            this.companyList = response.result.list;
+          });
+      },
+      getDataInfo(row){
+        let param ={"objectId":row.objectId}
+
+        listCredit(param).then(response => {
+          this.creditListInfo = response.rows;
+          this.infoDialog = true;
+        });
+
+      },
+      getData(stauts){
+        this.queryParams.status=0;
+        this.queryParams.lostCredit=stauts;
+        this.getList();
+      },
+      getHistoryData(){
+        this.queryParams.status=1;
+        this.getList();
+      },
+      colStyle(obj){
+        if(obj.column.property == "id"){
+          return {background:"#f8f8f9"}
+        }
+      },
+      getObjId(a){
+        this.form.objectId = a.id;
+        this.form.place = a.areaName;
+      },
+      getList() {
+        this.loading = true;
+        if(this.queryParams.status==0){
+          listCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+        if(this.queryParams.status==1){
+          historyCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.isEdit = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          name: null,
+          time: null,
+          place: null,
+          reason: null,
+          lostCredit: null,
+          objectId: null,
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        console.log(this.queryParams);
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "企业信息录入";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getCredit(id).then(response => {
+          this.form = response.data;
+          this.isEdit = true;
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        if(this.isEdit){
+          this.$refs["updateForm"].validate(valid => {
+            if (valid) {
+              this.loading = true;
+                this.form.lostCredit = 0;
+                this.updateForm.id = this.form.id;
+                let data = [{id:this.form.objectId,dishonestState:this.form.lostCredit}];
+                updateCompany(data).then(res=>{
+                  updateCredit(this.updateForm).then(response => {
+                    this.msgSuccess("撤销成功");
+                    this.isEdit = false;
+                    this.updateForm = {};
+                    this.init();
+                  });
+                });
+            }
+          });
+        }else{
+          this.$refs["form"].validate(valid => {
+            if (valid) {
+              this.loading = true;
+                this.form.lostCredit = 1;
+                let data = [{id:this.form.objectId,dishonestState:this.form.lostCredit}];
+                updateCompany(data).then(res=>{
+                  addCredit(this.form).then(response => {
+                    this.msgSuccess("新增成功");
+                    this.open = false;
+                    this.init();
+                  });
+                });
+            }
+          });
+        }
+      },
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有企业数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportCredit(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+      }
+    }
+  };
 \ No newline at end of file
+import {
+    listCredit,
+    getCredit,
+    delCredit,
+    addCredit,
+    updateCredit,
+    exportCredit,
+    getNames,
+    getTypes,
+    getPlaces,
+    historyCredit
+  } from "@/api/business/constructionsites";
+
+  import {
+    constructionsitesList,
+    getDict,
+    getArea,
+    updateConstructionsites
+  } from "@/api/dict";
+
+  export default {
+    name: "ConstructionCredit",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        infoDialog: false,
+        // 总条数
+        total: 0,
+        // 工地表格数据
+        creditList: [],
+        creditListInfo: [],
+        dictNames: [],
+        dictTypes: [],
+        dictPlaces: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        isEdit: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          name: null,
+          type: null,
+          time: null,
+          place: null,
+          reason: null,
+          status: 0,
+          lostCredit: 1,
+        },
+        // 表单参数
+        form: {
+        },
+        updateForm: {},
+        //建筑垃圾类型集合
+        trashTypes: [],
+        constructionList: [],
+        // 表单校验
+        rules: {
+          name: [{
+            required: true,
+            message: '请选择工地',
+            trigger: 'change'
+          }, ],
+          reason: [{
+            required: true,
+            message: '请填写原因',
+            trigger: 'change'
+          }, ]
+        },
+        areas:[],
+      };
+
+
+    },
+    created() {
+
+      getArea().then(res => {
+          this.areas = res.result;
+      });
+
+      getDict({'type': 'CSDisSiteDisposalType'}).then(response => {
+        this.trashTypes = response.result;
+      });
+
+      this.init();
+
+    },
+    methods: {
+      init(){
+        this.reset();
+        this.resetQuery();
+        this.getList();
+        this.getNamesData();
+        this.getTypesData();
+        this.getPlacesData();
+
+        let query = {
+          'page': 1,
+          'size': 9999,
+          'creditStatus': 0
+        };
+        constructionsitesList(query).then(response => {
+          this.constructionList = response.result.list
+        });
+      },
+      getList() {
+        this.loading = true;
+        if (this.queryParams.status == 0) {
+          listCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+        if (this.queryParams.status == 1) {
+          historyCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+      },
+      getDataInfo(row) {
+        let param = {
+          "objectId": row.objectId
+        }
+        listCredit(param).then(response => {
+          this.creditListInfo = response.rows;
+          this.infoDialog = true;
+        });
+      },
+      getNamesData() {
+        getNames(this.queryParams).then(response => {
+          this.dictNames = response;
+        });
+      },
+      getTypesData() {
+         getTypes(this.queryParams).then(response => {
+          this.dictTypes = response;
+        });
+      },
+      getPlacesData() {
+        getPlaces(this.queryParams).then(response => {
+          this.dictPlaces = response;
+        });
+      },
+      getData(stauts) {
+        this.queryParams.status = 0;
+        this.queryParams.lostCredit = stauts;
+        this.init();
+      },
+      getHistoryData() {
+        this.queryParams.status = 1;
+        this.init();
+      },
+      colStyle(obj) {
+        if (obj.column.property == "id") {
+          return {
+            background: "#f8f8f9"
+          }
+        }
+      },
+      getObjId(object) {
+
+        this.form.objectId = object.id;
+
+        for(let i in this.areas){
+          if(this.areas[i].code == Number(object.areaCode)){
+            this.form.place = this.areas[i].name;
+            break;
+          }
+        }
+        for(let i in this.trashTypes){
+          if(this.trashTypes[i].code == Number(object.cargoId)){
+            this.form.type = this.trashTypes[i].name;
+            break;
+          }
+        }
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.isEdit = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          name: null,
+          type: null,
+          time: null,
+          place: null,
+          reason: null,
+          lostCredit: null,
+          objectId: null,
+        };
+        this.updateForm = {
+          reason:null,
+        };
+        this.resetForm("updateForm");
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        console.log(this.queryParams);
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加工地";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getCredit(id).then(response => {
+          this.form = response.data;
+          this.isEdit = true;
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+              this.loading = true;
+            if (this.form.id != null) {
+              this.form.lostCredit = 0;
+              let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
+
+              updateConstructionsites(data).then(response=>{
+                  this.updateForm.id = this.form.id;
+                  updateCredit(this.updateForm).then(response => {
+                    this.msgSuccess("撤销成功");
+                    this.isEdit = false;
+                    this.init();
+                  });
+                });
+            } else {
+              this.form.lostCredit = 1;
+              let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
+              updateConstructionsites(data).then(response=>{
+                addCredit(this.form).then(response => {
+                  this.msgSuccess("新增成功");
+                  this.open = false;
+                  this.init();
+                });
+              });
+            }
+          }
+        });
+      },
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有工地数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportCredit(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+      }
+    }
+  };
 \ No newline at end of file
+import {
+  dayWorkList,
+  exportDayWorkList,
+  exportDayWorkHistoryList
+} from "@/api/business/daywork";
+
+
+import {
+  Upload
+} from "element-ui";
+import {
+  getToken
+} from "@/utils/auth";
+
+import {
+  earthsitesList,
+  constructionsitesList,
+  getDict,
+  getArea
+} from "@/api/dict";
+
+export default {
+  name: "dayWorkReport",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+
+      reUpdate: false,
+
+      info: false,
+
+      infoData: null,
+      businessKey: null,
+      picSample: false,
+      uploadImageDialog: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 开工报表表格数据
+      threestepList: [],
+      fileList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workStartTime: null,
+        workEndTime: null,
+        name: null,
+        earthsitesName: null,
+        place: null,
+        subReason: null,
+      },
+      // 表单参数
+      form: {},
+      picIndex: null,
+      // 表单校验
+      rules: {},
+      SiteWorkAreaCodeType: [],
+      remoteData: [{
+        name: "a",
+        id: "id"
+      }],
+      remoteQueryData: {
+        "page": 1,
+        "size": 9999
+      },
+      areas: [{
+        code: "a",
+        name: "A"
+      }],
+      constructionsitesList: [],
+      earthsitesList: [],
+      areaCode: null,
+      bindData: [{
+        name: "a",
+        id: "id"
+      }],
+      bindname: null,
+      projectTypes: null,
+      earthsitesTypes: null,
+      dayWorkCount: null,
+      outside: ["长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"],
+    };
+  },
+  created() {
+    this.getList(0);
+    
+    getArea().then(res=>{
+      this.areas = res.result;
+    });
+
+  },
+  methods: {
+    areaClear() {
+      this.areaCode = null;
+    },
+    selectArea(a) {
+      this.areaCode = a;
+    },
+    getObjId(item) {
+      if (this.form.type == 0) {
+        this.form.objectId = item.id;
+        this.form.place = Number(item.areaCode);
+      } else {
+        this.form.earthsitesId = item.id;
+        this.form.place = Number(item.areaCode);
+      }
+    },
+    getEarthsiteId(item) {
+      if (this.form.type == 0) {
+        this.form.objectId = item.id;
+      } else {
+        this.form.earthsitesId = item.id;
+      }
+    },
+    handleClose() {
+      this.uploadImageDialog = false;
+      this.fileList = [];
+    },
+
+    getListAndExport() {
+      var page = this.queryParams.page;
+      var size = this.queryParams.pageSize;
+
+
+      this.queryParams.page = 1;
+      this.queryParams.pageSize = 9999;
+
+
+      dayWorkList(this.queryParams).then(response => {
+
+        let list = response.rows;
+
+        for (let i = 0; i < list.length; i++) {
+          list[i].place = this.getAreaName(list[i].place);
+          if (this.outside.indexOf(list[i].place) > -1) {
+            if (list[i].status == "开工") {
+              list[i].estatus = "开工";
+              list[i].eselfCheckTime = list[i].selfCheckTime;
+              list[i].descript = "开工";
+            }
+          }
+        }
+        let data = [];
+        let index = 1;
+        for (let i in list) {
+
+          let obj = {
+            id: index,
+            name: list[i].name,
+            createTime: list[i].createTime,
+            selfCheckTime: list[i].selfCheckTime,
+            place: list[i].place,
+            status: list[i].status,
+            ename: list[i].ename,
+            eplace: list[i].eplace,
+            estatus: list[i].estatus,
+            eselfCheckTime: list[i].eselfCheckTime,
+            descript: list[i].descript,
+          }
+
+          data.push(obj);
+          index += 1;
+
+        }
+
+
+        if (this.queryParams.his == 1) {
+          exportDayWorkHistoryList(data).then(res => {
+
+            this.loading = false;
+
+            this.queryParams.page = page;
+            this.queryParams.pageSize = size;
+
+            this.download(res.message);
+
+          });
+        } else {
+          exportDayWorkList(data).then(res => {
+
+            this.loading = false;
+            debugger;
+            console.log(page);
+            this.queryParams.page = page;
+            console.log(size);
+            this.queryParams.pageSize = size;
+
+            this.download(res.message);
+
+          });
+        }
+
+
+
+      });
+
+    },
+    /** 查询开工报表列表 */
+    getList(tabIdx) {
+
+      this.loading = true;
+
+      // let query = this.queryParams;
+
+      if (tabIdx == 1) {
+        this.resetQuery();
+        this.queryParams.his = tabIdx;
+      } else if (tabIdx == 0) {
+        this.resetQuery();
+        this.queryParams.his = tabIdx;
+      }
+
+      dayWorkList(this.queryParams).then(response => {
+
+        this.threestepList = response.rows;
+
+
+          for (let i = 0; i < this.threestepList.length; i++) {
+            if (this.outside.indexOf(this.threestepList[i].place) > -1) {
+              if (this.threestepList[i].status == "开工") {
+                this.threestepList[i].estatus = "开工";
+                this.threestepList[i].eselfCheckTime = this.threestepList[i].selfCheckTime;
+                this.threestepList[i].descript = "开工";
+              }
+            }
+
+          }
+
+            this.loading = false;
+          this.dayWorkCount = response.msg;
+          this.total = response.total;
+      });
+
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: null,
+        place: null,
+        selfCheckTime: null,
+        objectId: null,
+        earthsitesId: null,
+        createTime: null,
+        checkTime: null,
+        earthsitesName: null,
+        contract: null,
+        companys: null,
+        companyTrucks: null,
+        img0: null,
+        img1: null,
+        img2: null,
+        img3: null,
+        img4: null,
+        img5: null,
+        img6: null,
+        img7: null,
+        img8: null,
+        img9: null,
+        img10: null,
+        img11: null,
+        img12: null,
+        person: null,
+        phone: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.workEndTime = null;
+      this.queryParams.workStartTime = null;
+      this.queryParams.subReason = null;
+      this.queryParams.place = null;
+      this.queryParams.earthsitesName = null;
+      this.queryParams.name = null;
+
+
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "报工自查";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.businessKey = row.id + "";
+      this.info = true;
+    },
+    getAreaName(code) {
+      for (let i = 0; i < this.areas.length; i++) {
+        if (Number(code) == this.areas[i].code) {
+          return this.areas[i].name;
+          break;
+        }
+      }
+      return code;
+    },
+
+    reSub(row) {
+      this.reset();
+
+      this.open = true;
+      this.title = "再次提交";
+      getThreestep(row.id).then(res => {
+        this.form = res.data;
+        this.form.type = this.form.type + "";
+
+        for (let i = 0; i < 13; i++) {
+          if (this.form["img" + i]) {
+            this.form["img" + i] = this.form["img" + i].split(",");
+          }
+        }
+
+
+        this.form.status = 0;
+        this.form.id = null;
+      });
+
+
+
+    },
+
+    checkEndSuccess() {
+      this.form.checkEndTime = new Date();
+      this.form.id = this.businessKey;
+      for (let i = 1; i < 4; i++) {
+        if (this.form["attchItem" + i]) {
+          this.form["attchItem" + i] = this.form["attchItem" + i] + "";
+        }
+      }
+      this.submitForm();
+    },
+    checkEndError() {
+      console.log(this.form, this.businessKey);
+      //发起案卷
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateThreestep(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.open2 = false;
+              this.getList();
+            });
+          } 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] + "";
+              }
+            }
+            addThreestep(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.open2 = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除开工报表编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delThreestep(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      let curPage = this.queryParams.page;
+      let curSize = this.queryParams.pageSize;
+      let that = this;
+
+      this.$confirm('是否确认导出所有开工报表数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        that.loading = true;
+        that.getListAndExport();
+      });
+
+    }
+  }
+};
@@ -94,8 +94,8 @@ export function updateTruck(data) {
 export function driverList(data) {
   return requestRemote({
     url: '/api/gpsservice/v1/drivers/search',
-    method: 'get',
-    params: data
+    method: 'post',
+    data: data
   });
 }
 export function updateDriver(data) {
+import {
+  listCredit,
+  getCredit,
+  delCredit,
+  addCredit,
+  updateCredit,
+  exportCredit,
+  getNames,
+  historyCredit
+} from "@/api/business/driver";
+
+import {
+  companyList,
+  driverList
+} from "@/api/dict";
+
+export default {
+  name: "ConstructionCredit",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      infoDialog :false,
+      // 总条数
+      total: 0,
+      // 工地表格数据
+      creditList: [],
+      creditListInfo: [],
+      dictNames:[],
+      dictTypes:[],
+      dictPlaces:[],
+      driverList:[],
+      names:[],
+      idNumbers:[],
+      places:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      isEdit:false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idNumber: null,
+        time: null,
+        reason: null,
+        status: 0,
+        lostCredit: 1
+      },
+      // 表单参数
+      form: {},
+      updateForm:{},
+      // 表单校验
+      rules: {name: [
+          { required: true, message: '请选择驾驶员', trigger: 'change' },
+        ],reason: [
+          { required: true, message: '请填写原因', trigger: 'change' },
+        ]}
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init(){
+      this.reset();
+
+        this.resetQuery();
+        this.getList();
+        this.getNamesData();
+
+
+      let data = {};
+        driverList(data).then(res=>{
+
+          this.driverList = res.list;
+
+        });
+
+    },
+    getDataInfo(row){
+      let param ={"objectId":row.objectId}
+      listCredit(param).then(response => {
+        this.creditListInfo = response.rows;
+        this.infoDialog = true;
+      });
+
+    },
+    getNamesData(){
+      getNames(this.queryParams).then(response => {
+        this.dictNames = response;
+      });
+    },
+    getData(stauts){
+      this.queryParams.status=0;
+      this.queryParams.lostCredit=stauts;
+      this.getList();
+    },
+    getHistoryData(){
+      this.queryParams.status=1;
+      this.init();
+    },
+    colStyle(obj){
+      if(obj.column.property == "id"){
+        return {background:"#f8f8f9"}
+      }
+    },
+    getObjId(value){
+      for(let i in this.driverList){
+          if(this.driverList[i].name == value){
+            this.form.objectId = this.driverList[i].id;
+            this.form.idNumber = this.driverList[i].identityNo;
+          }
+      }
+    },
+    getList() {
+      this.loading = true;
+      if(this.queryParams.status==0){
+        listCredit(this.queryParams).then(response => {
+          this.creditList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
+      if(this.queryParams.status==1){
+        historyCredit(this.queryParams).then(response => {
+          this.creditList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.isEdit = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        idNumber: null,
+        time: null,
+        reason: null,
+        lostCredit: null,
+        objectId: null,
+      };
+      this.updateForm = {};
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      console.log(this.queryParams);
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加驾驶员";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCredit(id).then(response => {
+        this.form = response.data;
+        this.isEdit = true;
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if(this.open){
+        this.updateForm.reason = "1";
+      }
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+
+            this.loading = true;
+          if (this.form.id != null) {
+            this.updateForm.id = this.form.id;
+            updateCredit(this.updateForm).then(response => {
+              this.msgSuccess("撤销成功");
+              this.isEdit = false;
+              this.init();
+            });
+          } else {
+            this.form.lostCredit = 1;
+            addCredit(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.init();
+            });
+          }
+        }
+      });
+    },
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有驾驶员数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportCredit(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
+    }
+  }
+};
 \ No newline at end of file
+
+import {
+  listCredit,
+  getCredit,
+  delCredit,
+  addCredit,
+  updateCredit,
+  exportCredit,
+  getNames,
+  getTypes,
+  getPlaces,
+  historyCredit
+} from "@/api/business/earthsites";
+
+import {
+  earthsitesList,
+  updateEarthsites
+} from "@/api/dict";
+
+import requestRemote from '@/utils/requestRemote'
+
+export default {
+  name: "EarthSitesCredit",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      infoDialog :false,
+      // 总条数
+      total: 0,
+      // 工地表格数据
+      creditList: [],
+      creditListInfo: [],
+      earthsitesList:[],
+      dictNames:[],
+      dictTypes:[],
+      dictPlaces:[],
+      names:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      isEdit:false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+        time: null,
+        place: null,
+        reason: null,
+        status: 0,
+        lostCredit: 1
+      },
+      // 表单参数
+      form: {},
+      updateForm:{},
+      // 表单校验
+      rules: {name: [
+          { required: true, message: '请选择消纳场', trigger: 'change' },
+        ],reason: [
+          { required: true, message: '请填写原因', trigger: 'change' },
+        ]}
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init(){
+        this.resetQuery();
+      this.reset();
+      this.getList();
+      this.getNamesData();
+      this.getTypesData();
+      this.getPlacesData();
+
+      let query = {
+        'page': 1,
+        'size': 9999,
+        'creditStatus': 0
+      };
+      earthsitesList(query).then(response => {
+        this.earthsitesList = response.result.list
+      });
+    },
+    getDataInfo(row){
+      let param ={"objectId":row.objectId}
+      listCredit(param).then(response => {
+        this.creditListInfo = response.rows;
+        this.infoDialog = true;
+      });
+
+    },
+    getNamesData(){
+      getNames(this.queryParams).then(response => {
+        this.dictNames = response;
+      });
+    },
+    getTypesData() {
+       getTypes(this.queryParams).then(response => {
+        this.dictTypes = response;
+      });
+    },
+    getPlacesData() {
+      getPlaces(this.queryParams).then(response => {
+        this.dictPlaces = response;
+      });
+    },
+    getData(stauts){
+      this.queryParams.status=0;
+      this.queryParams.lostCredit=stauts;
+      this.init();
+    },
+    getHistoryData(){
+      this.queryParams.status=1;
+      this.init();
+    },
+    colStyle(obj){
+      if(obj.column.property == "id"){
+        return {background:"#f8f8f9"}
+      }
+    },
+    getObjId(a){
+      this.form.objectId = a.id;
+      this.form.place = a.areaName;
+      this.form.type = a.typeName;
+    },
+    getList() {
+      this.loading = true;
+      if(this.queryParams.status==0){
+        listCredit(this.queryParams).then(response => {
+          this.creditList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
+      if(this.queryParams.status==1){
+        historyCredit(this.queryParams).then(response => {
+          this.creditList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.isEdit = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: null,
+        time: null,
+        place: null,
+        reason: null,
+        lostCredit: null,
+        objectId: null,
+      };
+      this.updateForm = {};
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      console.log(this.queryParams);
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加消纳场";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCredit(id).then(response => {
+        this.form = response.data;
+        this.isEdit = true;
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+        if(this.open){
+          this.updateForm.reason = "1";
+        }
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+        this.loading = true;
+          if (this.form.id != null) {
+            this.form.lostCredit = 0;
+            let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
+            updateEarthsites(data).then(res=>{
+              this.updateForm.id = this.form.id;
+              updateCredit(this.updateForm).then(response => {
+                this.msgSuccess("撤销成功");
+                this.isEdit = false;
+
+                this.init();
+              });
+            });
+          } else {
+            this.form.lostCredit = 1;
+            let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
+            updateEarthsites(data).then(res=>{
+              addCredit(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+
+                this.init();
+              });
+            });
+
+          }
+        }
+      });
+    },
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有消纳场数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportCredit(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
+    }
+  }
+};
 \ No newline at end of file
+import {
+  listLeaveApplication,
+  getLeaveApplication,
+  delLeaveApplication,
+  addLeaveApplication,
+  updateLeaveApplication,
+  exportLeaveApplication
+} from "@/api/office/leaveApplication";
+import Editor from '@/components/ZcEditor';
+import leaveApplicationInfo from '@/views/office/leaveApplication/leaveApplicationInfo';
+import {getDict} from "@/api/dict";
+
+import h5Page from '@/views/h5/Pagination';
+import h5Info from "@/views/h5/leaveApplication/leaveApplicationInfo";
+
+export default {
+  name: "LeaveApplication",
+  components: {Editor, leaveApplicationInfo,h5Page,h5Info},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 请假申请表格数据
+      leaveApplicationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applicant: null,
+        deptName: null,
+        positionId: null,
+        birthdate: null,
+        phone: null,
+        type: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        type: [
+          {required: true, message: '必填', trigger: 'change'},
+        ],
+        beginDate: [
+          {required: true, message: '必填', trigger: 'change'},
+        ],
+        endDate: [
+          {required: true, message: '必填', trigger: 'change'},
+        ],
+        phone: [
+          {required: true, message: '必填', trigger: 'change'},
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
+        numberDays: [
+          {required: true, message: '必填', trigger: 'change'},
+          {
+            pattern: /^(0|[1-9]\d*)(\.5)?$/,
+            message: '只能为整数或者0.5',
+            trigger: 'change'
+          },
+          {
+            pattern: /^(?!0+(\.0+)?$)\d+(\.\d+)?$/,
+            message: '不能为0',
+            trigger: 'change'
+          }
+        ]
+      },
+      openInfo: false,
+      idInfo: null,
+      fileEntityList:[],
+      depts:[]
+    };
+  },
+  created() {
+    let dep =  {type:"CSUserDepartmentType"};
+    getDict(dep).then(res=>{
+      this.depts = res.result;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询请假申请列表 */
+    getList() {
+      this.loading = true;
+      listLeaveApplication(this.queryParams).then(response => {
+        this.leaveApplicationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openInfo = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.fileEntityList = [];
+      this.form = {
+        id: null,
+        applicant: null,
+        deptName: null,
+        positionId: null,
+        workDate: null,
+        birthdate: null,
+        phone: null,
+        type: null,
+        beginDate: null,
+        endDate: null,
+        numberDays: null,
+        content: null,
+        status: 0,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 查看按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      this.idInfo = row.id+"";
+      this.title = "请假申请详情";
+      this.openInfo = true;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加请假申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLeaveApplication(id).then(response => {
+        this.form = response.data.leaveApplication;
+        let files = JSON.stringify(response.data.uploadFiles);
+        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
+        this.open = true;
+        this.title = "修改请假申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+          formData.append('fileList', null);
+          //将新增的文件放入formData
+          this.fileEntityList.forEach(item => {
+            if(item.id==null){
+              formData.append('fileList', item.raw)
+            }
+          })
+          if (this.form.id != null) {
+            formData.append("leaveApplication", JSON.stringify(form));
+            formData.append("uploadFilesList", null);
+            this.fileEntityList.forEach(item => {
+              delete item.params;
+              if(item != "null" && item != null){
+                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
+              }
+            })
+            updateLeaveApplication(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            for (let key in form) {
+              formData.append(key, form[key] == null ? "" : form[key])
+            }
+            addLeaveApplication(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除请假申请编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delLeaveApplication(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有请假申请数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportLeaveApplication(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过5M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 5;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过5M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.fileEntityList = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    // 删除文件
+    handleDeleteFile(index) {
+      this.fileEntityList.splice(index, 1);
+    },
+    /** 文件下载 */
+    downloadFA(row) {
+      let name = row.name;
+      let url = row.url;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+      a.click()
+    },
+  }
+};
@@ -295,8 +295,6 @@
           let name = this.form.earthsitesName;
           let objId = this.form.earthsitesId;
-
-
           this.form.objectId = item.id;
           this.form.place = Number(item.areaCode);
           this.filterConract();
@@ -310,8 +308,6 @@
               }
            }
-
-
           if(this.form.type == 0){
             let query = {
               'page':1,
@@ -343,13 +339,18 @@
               getConstructionTruck(item.id).then(res=>{
                 for(let i in res.result){
+                  debugger;
                     this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
-                    query.companyID += "," + res.result[i].companyId;
+                    for(let j in res.result[i].vehicleList){
+                      this.truckList.push({id:res.result[i].vehicleList[j].id,licenseplateNo:res.result[i].vehicleList[j].licenseplateNo,companyName:res.result[i].companyName});
+                    }
                 }
-
                 truckList(query).then(res=>{
-                  this.truckList = res.result.list;
+                  for(let i in res.result.list){
+                    this.truckList.push(res.result.list[i]);
+                  }
                 });
+
               });
             });
           }
-import { listTruckActivate, getTruckActivate, delTruckActivate, addTruckActivate, updateTruckActivate, exportTruckActivate } from "@/api/business/truckActivate";
+import {
+  listTruckActivate,
+  getTruckActivate,
+  delTruckActivate,
+  addTruckActivate,
+  updateTruckActivate,
+  exportTruckActivate
+} from "@/api/business/truckActivate";
+
-  import {
-    todayDataList,
-  } from "@/api/business/threestep";
+import h5Page from '@/views/h5/Pagination';
+
+import {
+  todayDataList,
+} from "@/api/business/threestep";
 import {
-  truckList,
-  companyList,
+  mainworkcompany,
+  getConstructionTruck,
+  constructionById,
+  truckList
 } from "@/api/dict";
 export default {
   name: "TruckActivate",
+  components: {
+    h5Page,
+  },
   data() {
     return {
       // 遮罩层
@@ -32,7 +47,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      companyList:[],
+      companyList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -40,13 +55,14 @@ export default {
         company: null,
         licensePlate: null,
         time: null,
+        activateStatus:null,
         construction: null,
         status: null,
         earthsite: null,
         objectId: null,
         createType: null,
         activateTime: null,
-        activateDate:null,
+        activateDate: null,
       },
       // 表单参数
       form: {},
@@ -71,14 +87,14 @@ export default {
           trigger: 'change'
         }, ],
       },
-      constList:[],
-      truckList:[],
-
-      construction : null,
-      truck : null,
-      company:null,
-      openActivateTime:false,
-      isLoading:false,
+      constList: [],
+      truckList: [],
+
+      construction: null,
+      truck: null,
+      company: null,
+      openActivateTime: false,
+      isLoading: false,
     };
   },
   created() {
@@ -87,12 +103,12 @@ export default {
   methods: {
     /** 查询车辆激活列表 */
     getList(index) {
-      if(index == 0){
+      if (index == 0) {
         this.queryParams.status = "0";
         this.openActivateTime = false;
         this.queryParams.activateDate = null;
       }
-      if(index == 1){
+      if (index == 1) {
         this.openActivateTime = true;
         this.queryParams.status = "1";
       }
@@ -104,69 +120,73 @@ export default {
       });
       let data = {
-        type : 0,
-        status:1,
+        type: 0,
+        status: 1,
       }
-      todayDataList(data).then(res=>{
-          this.constList = res;
+      todayDataList(data).then(res => {
+        this.constList = res;
       });
     },
-    getCompany(value){
-      let obj;
+    getCompany(value) {
+      let item;
-      for(let i in this.constList){
-        if(this.constList[i].name == value){
+      for (let i in this.constList) {
+        if (this.constList[i].name == value) {
           this.construction = this.constList[i];
-          obj = this.construction;
+          item = this.construction;
         }
       }
-
       this.companyList = [];
       this.truckList = [];
-      constructionById(obj.objectId).then(res=>{
-
-
-        this.companyList.push({id:res.result.transportCompanyId , name: res.result.transportCompany});
+      constructionById(item.objectId).then(res => {
+        this.companyList.push({
+          id: res.result.transportCompanyId,
+          name: res.result.transportCompany
+        });
-        mainworkcompany(obj.objectId).then(response => {
+        mainworkcompany(item.id).then(response => {
           let query = {
-            'page':1,
-            'size':9999,
-            'dishonestState':0
+            'page': 1,
+            'size': 9999,
+            'dishonestState': 0,
+            'valid': 0
           }
-          let ids = [];
-
-          ids.push(res.result.transportCompanyId);
-
-          query.companyID = ids + "";
+          query.companyID = item.transportCompanyId + "";
           query.valid = 0;
-          getConstructionTruck(obj.objectId).then(res=>{
-            for(let i in res.result){
-
-              this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
-                query.companyID += "," + res.result[i].companyId;
+          getConstructionTruck(item.objectId).then(res => {
+            for (let i in res.result) {
+              this.companyList.push({
+                id: res.result[i].companyId,
+                name: res.result[i].companyName
+              });
+              for (let j in res.result[i].vehicleList) {
+                this.truckList.push({
+                  id: res.result[i].vehicleList[j].id,
+                  licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
+                  companyName: res.result[i].companyName
+                });
+              }
             }
-
-            truckList(query).then(res=>{
-              this.truckList = res.result.list;
+            truckList(query).then(res => {
+              for (let i in res.result.list) {
+                this.truckList.push(res.result.list[i]);
+              }
             });
           });
         });
-
-
-      })
+      });
     },
-    getTruck(truck){
-      this.truck = truck;
+    clearTruck() {
+      this.form.licensePlate = [];
     },
     // 取消按钮
     cancel() {
@@ -204,7 +224,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -229,34 +249,26 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          for(var i in this.form.licensePlate){
-            for(let j in this.truckList){
-              if(this.form.licensePlate[i] == this.truckList[j].id){
+          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,
+                  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();
                 });
-
-
               }
             }
           }
-
-
-
-
         }
       });
     },
@@ -264,28 +276,28 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除车辆激活编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delTruckActivate(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delTruckActivate(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有车辆激活数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportTruckActivate(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportTruckActivate(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
     }
   }
-};
 \ No newline at end of file
+};
+ import {
+    listCredit,
+    getCredit,
+    delCredit,
+    addCredit,
+    updateCredit,
+    exportCredit,
+    getNames,
+    getCompanys,
+    historyCredit
+  } from "@/api/business/truck";
+
+
+  import {
+    companyList,
+    truckList,
+    updateTruck
+  } from "@/api/dict";
+
+  export default {
+    name: "Credit",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        infoDialog: false,
+        // 总条数
+        total: 0,
+        // 工地表格数据
+        creditList: [],
+        creditListInfo: [],
+        dictNames: [],
+        dictCompanys: [],
+        companyList:[],
+        truckList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        isEdit: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          companyId: null,
+          licensePlate: null,
+          time: null,
+          reason: null,
+          status: 0,
+          lostCredit: 1
+        },
+        // 表单参数
+        form: {},
+        updateForm: {},
+        // 表单校验
+        rules: {
+          companyId: [{
+            required: true,
+            message: '请选择运输公司',
+            trigger: 'change'
+          }, ],
+          reason: [{
+            required: true,
+            message: '请填写原因',
+            trigger: 'change'
+          }, ],
+          licensePlate: [{
+            required: true,
+            message: '请选择车辆',
+            trigger: 'change'
+          }],
+        },
+        rules2: {
+          reason: [{
+            required: true,
+            message: '请填写原因',
+            trigger: 'change'
+          }, ],
+        }
+      };
+    },
+    created() {
+      this.init();
+    },
+    methods: {
+
+      init() {
+        this.resetQuery();
+        this.getList();
+        getNames(this.queryParams).then(response => {
+           this.dictNames = response;
+        });
+
+         getCompanys(this.queryParams).then(response => {
+           this.dictCompanys = response;
+        });
+
+          let query = {
+            'page':1,
+            'size':9999,
+            'dishonestState':0
+          }
+        companyList(query).then(response => {
+
+          let companys = response.result.list;
+          this.companyList = companys;
+          let ids = [];
+
+          for(let i = 0 ;i<companys.length;i++){
+            ids.push(companys[i].id);
+          }
+          query.companyID = ids + "";
+          query.valid = 0;
+
+          truckList(query).then(res=>{
+            this.truckList = res.result.list;
+          });
+
+        });
+
+
+      },
+      getDataInfo(row) {
+        console.log(row);
+
+        let param = {
+          "objectId": row.objectId
+        }
+
+        listCredit(param).then(response => {
+          this.creditListInfo = response.rows;
+          this.infoDialog = true;
+        });
+
+      },
+      getData(stauts) {
+        this.queryParams.status = 0;
+        this.queryParams.lostCredit = stauts;
+        this.init();
+      },
+      getHistoryData() {
+        this.queryParams.status = 1;
+        this.init();
+      },
+      colStyle(obj) {
+        if (obj.column.property == "id") {
+          return {
+            background: "#f8f8f9"
+          }
+        }
+      },
+      getObjId(a) {
+        this.form.companyId = a.companyName;
+        this.form.objectId = a.id;
+      },
+      getList() {
+        this.loading = true;
+        if (this.queryParams.status == 0) {
+          listCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+        if (this.queryParams.status == 1) {
+          historyCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.isEdit = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          companyId: null,
+          licensePlate: null,
+          time: null,
+          reason: null,
+          status: null,
+          lostCredit: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        console.log(this.queryParams);
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "车辆失信录入";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getCredit(id).then(response => {
+          this.form = response.data;
+          this.isEdit = true;
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        if(this.isEdit){
+          this.$refs["updateForm"].validate(valid => {
+            if (valid) {
+                this.loading = true;
+                this.form.lostCredit = 0;
+                this.updateForm.id = this.form.id;
+              let data = [{creditStatus:this.form.lostCredit,id:this.form.objectId}];
+              updateTruck(data).then(res=>{
+                updateCredit(this.updateForm).then(response => {
+                  this.msgSuccess("撤销成功");
+                  this.isEdit = false;
+                  this.updateForm = {};
+                  this.init();
+                });
+                });
+            }
+          });
+        }else{
+          this.$refs["form"].validate(valid => {
+            if (valid) {
+                this.loading = true;
+                this.form.lostCredit = 1;
+                this.form.createType = 0;
+                  let data = [{creditStatus:this.form.lostCredit,id:this.form.objectId}];
+                  updateTruck(data).then(res=>{
+                    addCredit(this.form).then(response => {
+                      this.msgSuccess("新增成功");
+                      this.open = false;
+                      this.init();
+                    });
+                  });
+            }
+          });
+        }
+      },
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有车辆数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportCredit(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+      }
+    }
+  };
 \ No newline at end of file
+
+import { listViolationCaseFile, getViolationCaseFile,
+        delViolationCaseFile, addViolationCaseFile,
+        updateViolationCaseFile, exportViolationCaseFile } from "@/api/casefile/violationCaseFile";
+import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+
+import h5Info from "@/views/h5/task/violationCaseFileInfo";
+import h5Page from "@/views/h5/Pagination";
+
+  import {
+    earthsitesList,
+    constructionsitesList,
+    getDict,
+    getArea,
+    companyList,
+    truckList,
+  } from "@/api/dict";
+
+
+export default {
+  name: "ViolationCaseFile",
+  components: { violationCaseFileInfo,
+   h5Page,
+   h5Info},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 平台违规案卷表格数据
+      violationCaseFileList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        number: null,
+        violationObjectType: null,
+        owningRegion: null,
+        violationType: null,
+        violationGrade: null,
+        projectName: null,
+        companyName: null,
+        describe: null,
+        sendObject: null,
+        status: null,
+        receive: null,
+        receiveStatus: null,
+        readBy: null,
+        readTime: null
+      },
+      // 表单参数
+      form: {
+
+      },
+      place:null,
+      // 表单校验
+      rules: {
+        number :[
+          { required: true, message: "必填", trigger: "blur" }
+        ],
+        violationObjectType :[
+          { required: true, message: "必填", trigger: "blur" }
+        ],
+        owningRegion :[
+          { required: true, message: "必填", trigger: "blur" }
+        ],
+        violationType :[
+          { required: true, message: "必填", trigger: "blur" }
+        ],
+      },
+      caseType:[{code:0,name:"进入非专用车辆"},
+      {code:1,name:"无许可手续（工）"},
+      {code:2,name:"无许可手续（消）"},
+      {code:3,name:"黄土覆盖情况"},
+      {code:4,name:"出入口路面污染"},
+      {code:5,name:"出入口道路硬化"},
+      {code:6,name:"车辆冲洗是否到位"},
+      {code:7,name:"雾炮机是否正常开启"},
+      {code:8,name:"使用费专用车运输"},
+      {code:9,name:"监控点位未对准"},
+      {code:10,name:"未报开工作业"},
+      {code:11,name:"视频设备离线超时报警"},
+      {code:12,name:"三无车辆进入工地"},
+      {code:13,name:"未按时间作业"},
+      {code:14,name:"未报开工作业"},
+      {code:15,name:"视频设备离线超时报警"},
+      {code:16,name:"三无车辆进入消纳场"},
+      {code:17,name:"未到指定的消纳场作业"},
+      {code:18,name:"离线运输报警（工）"},
+      {code:19,name:"离线运输报警（消）"},
+      {code:20,name:"未激活车辆作业"},
+      {code:21,name:"未核准作业车辆作业"},
+      {code:22,name:"未按线路行驶"},
+      {code:23,name:"闯禁行驶"},
+      {code:24,name:"失信车辆作业"},
+      {code:25,name:"其他1"},
+      {code:26,name:"其他2"},
+      {code:27,name:"其他3"},
+      {code:28,name:"其他4"},
+      {code:29,name:"其他5"}],
+
+      projectNameList:[
+      ],
+      isLoading: false,
+      fileEntityList:[],
+      companyList:[
+      ],
+      remoteQueryData: {
+        "page": 1,
+        "size": 9999
+      },
+      areas:[],
+      data:{},
+      isLoadingCompany: false,
+      idInfo:null,
+      openInfo:false,
+    };
+  },
+  created() {
+    getArea().then(res=>{
+
+      this.areas = res.result;
+    });
+
+
+    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]);
+         }
+      });
+    });
+
+
+    companyList(this.remoteQueryData).then(res => {
+       this.companyList = res.result.list;
+    });
+
+
+
+    this.getList();
+  },
+  methods: {
+    selectArea(item){
+
+      this.form.owningRegion = item.name;
+      this.form.projectName = null;
+
+    },
+    /** 查询平台违规案卷列表 */
+    getList() {
+      this.loading = true;
+      listViolationCaseFile(this.queryParams).then(response => {
+        this.violationCaseFileList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openInfo = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.fileEntityList = [];
+      this.form = {
+        id: null,
+        number: null,
+        violationObjectType: null,
+        owningRegion: null,
+        violationType: null,
+        violationGrade: null,
+        projectName: null,
+        companyName: null,
+        describe: null,
+        sendObject: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        status: 0,
+        receive: null,
+        receiveStatus: 0,
+        readBy: null,
+        readTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    handleInfo(row){
+      this.idInfo = row.id + "";
+      this.openInfo = true;
+      this.title = "平台违规案卷详情";
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.form.number = this.getNumber();
+      this.form.violationGrade = "一般类";
+      this.form.sendObject = "区管理部门(治)";
+      this.title = "添加平台违规案卷";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getViolationCaseFile(id).then(response => {
+        this.form = response.data.violationCaseFile;
+        let files = JSON.stringify(response.data.uploadFiles);
+        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
+        this.open = true;
+        this.title = "修改平台违规案卷";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+
+          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
+
+            this.$message("请选择相关企业");
+
+            return;
+          }
+
+
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+          formData.append('fileList', null);
+          //将新增的文件放入formData
+          this.fileEntityList.forEach(item => {
+            if(item.id==null){
+              formData.append('fileList', item.raw)
+            }
+          })
+          if (this.form.id != null) {
+            formData.append("violationCaseFile", JSON.stringify(form));
+            formData.append("uploadFilesList", null);
+            this.fileEntityList.forEach(item => {
+              delete item.params;
+              if(item != "null" && item != null){
+                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
+              }
+            })
+            updateViolationCaseFile(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            for (let key in form) {
+              formData.append(key, form[key] == null ? "" : form[key])
+            }
+            addViolationCaseFile(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除平台违规案卷编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delViolationCaseFile(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有平台违规案卷数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportViolationCaseFile(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+    },
+    /** 生成案卷编号 */
+    getNumber(){
+      const now = new Date();
+      const year = now.getFullYear().toString().slice(-2); // 提取后两位数
+      const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
+      const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
+      const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
+      const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
+      const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
+      const millisecond = now.getMilliseconds();
+      const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
+      return code;
+    },
+    projectNameLoadOptions(query) {
+      // 根据输入的关键字query异步加载选项数据
+      this.isLoading = true
+      setTimeout(() => {
+        // 模拟异步加载数据
+        const data = [
+          { name:'项目1' },
+          { name:'项目2' },
+          { name:'项目3' }
+        ].filter(item => item.name.includes(query))
+        this.projectNameList = data
+        this.isLoading = false
+      }, 200)
+    },
+    companyLoadOptions(query) {
+      // 根据输入的关键字query异步加载选项数据
+      this.isLoadingCompany = true
+      setTimeout(() => {
+        // 模拟异步加载数据
+        const data = [
+          { name:'公司1' },
+          { name:'公司2' },
+          { name:'公司3' }
+        ].filter(item => item.name.includes(query))
+        this.companyList = data
+        this.isLoadingCompany = false
+      }, 200)
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 20;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过20M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.fileEntityList = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    // 删除文件
+    handleDeleteFile(index) {
+      this.fileEntityList.splice(index, 1);
+    },
+    /** 文件下载 */
+    downloadFA(row) {
+      let name = row.name;
+      let url = row.url;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+      a.click()
+    },
+    /** 生成违规描述 */
+    createDescribe(){
+      this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }]
+      this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }]
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let formData = this.form;
+          const now = new Date();
+          const year = now.getFullYear();
+          const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
+          const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
+          const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
+          const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
+          const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
+          const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
+          this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
+          this.rules.companyName = null;
+          this.rules.projectName = null;
+        }
+      });
+
+    }
+  }
+};
+import {
+  listViolationWarningInformation,
+  getViolationWarningInformation,
+  delViolationWarningInformation,
+  addViolationWarningInformation,
+  updateViolationWarningInformation,
+  exportViolationWarningInformation
+} from "@/api/casefile/violationWarningInformation";
+
+import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+
+
+import h5Page from '@/views/h5/Pagination';
+import h5Info from "@/views/h5/task/violationWarningInformationInfo";
+
+
+import {
+  earthsitesList,
+  constructionsitesList,
+  getDict,
+  getArea,
+  companyList,
+  truckList,
+} from "@/api/dict";
+import {
+  getEarthSitesList,
+  getConstructionList,
+  getCompanyList,
+  getAreaList
+} from "@/api/casefile/remoteServer";
+
+export default {
+  name: "ViolationWarningInformation",
+  components: {
+    violationWarningInformationInfo,
+    h5Page,
+    h5Info
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 违规预警信息表格数据
+      violationWarningInformationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        number: null,
+        violationObjectType: null,
+        owningRegion: null,
+        violationType: null,
+        violationGrade: null,
+        projectName: null,
+        companyName: null,
+        describe: null,
+        sendObject: null,
+        receive: null,
+        receiveStatus: null,
+        readBy: null,
+        readTime: null,
+        replyOne: null,
+        replyTwo: null,
+        replyThree: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        number: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        violationObjectType: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        owningRegion: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+        violationType: [{
+          required: true,
+          message: "必填",
+          trigger: "blur"
+        }],
+      },
+      caseType: [{
+          code: 0,
+          name: "工地预警-未报开工作业"
+        },
+        {
+          code: 1,
+          name: "工地预警-视频设备离线超时报警"
+        },
+        {
+          code: 2,
+          name: "工地预警-三无车辆进入工地"
+        },
+        {
+          code: 3,
+          name: "工地预警未按时间作业"
+        },
+        {
+          code: 4,
+          name: "消纳场预警-未报开工作业"
+        },
+        {
+          code: 5,
+          name: "消纳场预警-视频设备离线超时报警"
+        },
+        {
+          code: 6,
+          name: "消纳场预警-三无车辆进入消纳场"
+        },
+        {
+          code: 7,
+          name: "消纳场预警-未到指定的消纳场作业"
+        },
+        {
+          code: 8,
+          name: "离线运输报警(工)"
+        },
+        {
+          code: 9,
+          name: "离线运输报警(消)"
+        },
+        {
+          code: 10,
+          name: "未激活车辆作业"
+        },
+        {
+          code: 11,
+          name: "未核准作业车辆作业"
+        },
+        {
+          code: 12,
+          name: "未按线路行驶"
+        },
+        {
+          code: 13,
+          name: "闯禁行驶"
+        },
+        {
+          code: 14,
+          name: "失信车辆作业"
+        }
+      ],
+      projectNameList: [],
+      isLoading: false,
+      fileEntityList: [],
+      companyList: [],
+      remoteQueryData: {
+        "page": 1,
+        "size": 9999
+      },
+      isLoadingCompany: false,
+      idInfo: null,
+      openInfo: false,
+      areas: [],
+      data: {},
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+
+
+    getEarthSitesList().then(res => {
+      for (var i in res.data) {
+        this.projectNameList.push({
+          name: res.data[i].name
+        });
+      }
+    });
+    getConstructionList().then(res => {
+      for (var i in res.data) {
+        this.projectNameList.push({
+          name: res.data[i].name
+        });
+      }
+    });
+
+
+    getCompanyList(this.remoteQueryData).then(res => {
+      this.companyList = res.data;
+    });
+    this.getList();
+  },
+  methods: {
+    selectArea(item) {
+
+      this.form.owningRegion = item.name;
+
+    },
+    /** 查询违规预警信息列表 */
+    getList() {
+      this.loading = true;
+      listViolationWarningInformation(this.queryParams).then(response => {
+        this.violationWarningInformationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openInfo = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.fileEntityList = [];
+      this.form = {
+        id: null,
+        number: null,
+        violationObjectType: null,
+        owningRegion: null,
+        violationType: null,
+        violationGrade: null,
+        projectName: null,
+        companyName: null,
+        describe: null,
+        sendObject: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        receive: null,
+        receiveStatus: 0,
+        readBy: null,
+        readTime: null,
+        replyOne: null,
+        replyTwo: null,
+        replyThree: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleInfo(row) {
+      this.idInfo = row.id + "";
+      this.openInfo = true;
+      this.title = "平台违规案卷详情";
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.form.number = this.getNumber();
+      this.form.violationGrade = "一般类";
+      this.form.sendObject = "区管理部门(治)";
+      this.title = "添加违规预警信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getViolationWarningInformation(id).then(response => {
+        this.form = response.data.violationWarningInformation;
+        let files = JSON.stringify(response.data.uploadFiles);
+        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
+        this.open = true;
+        this.title = "修改违规预警信息";
+      });
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.sendObject == "运输企业" && this.form.companyName == null) {
+
+            this.$message("请选择相关企业");
+
+            return;
+          }
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+          formData.append('fileList', null);
+          //将新增的文件放入formData
+          this.fileEntityList.forEach(item => {
+            if (item.id == null) {
+              formData.append('fileList', item.raw)
+            }
+          })
+          if (this.form.id != null) {
+            formData.append("violationWarningInformation", JSON.stringify(form));
+            formData.append("uploadFilesList", null);
+            this.fileEntityList.forEach(item => {
+              delete item.params;
+              if (item != "null" && item != null) {
+                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath")
+                  .replaceAll("name", "fileName"));
+              }
+            })
+            updateViolationWarningInformation(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            for (let key in form) {
+              formData.append(key, form[key] == null ? "" : form[key])
+            }
+            addViolationWarningInformation(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除违规预警信息编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delViolationWarningInformation(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportViolationWarningInformation(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
+    },
+    /** 生成案卷编号 */
+    getNumber() {
+      const now = new Date();
+      const year = now.getFullYear().toString().slice(-2); // 提取后两位数
+      const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
+      const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
+      const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
+      const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
+      const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
+      const millisecond = now.getMilliseconds();
+      const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
+      return code;
+    },
+    projectNameLoadOptions(query) {
+      // 根据输入的关键字query异步加载选项数据
+      this.isLoading = true
+      setTimeout(() => {
+        // 模拟异步加载数据
+        const data = [{
+            name: '项目1'
+          },
+          {
+            name: '项目2'
+          },
+          {
+            name: '项目3'
+          }
+        ].filter(item => item.name.includes(query))
+        this.projectNameList = data
+        this.isLoading = false
+      }, 200)
+    },
+    companyLoadOptions(query) {
+      // 根据输入的关键字query异步加载选项数据
+      this.isLoadingCompany = true
+      setTimeout(() => {
+        // 模拟异步加载数据
+        const data = [{
+            name: '公司1'
+          },
+          {
+            name: '公司2'
+          },
+          {
+            name: '公司3'
+          }
+        ].filter(item => item.name.includes(query))
+        this.companyList = data
+        this.isLoadingCompany = false
+      }, 200)
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 20;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过20M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.fileEntityList = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    // 删除文件
+    handleDeleteFile(index) {
+      this.fileEntityList.splice(index, 1);
+    },
+    /** 文件下载 */
+    downloadFA(row) {
+      let name = row.name;
+      let url = row.url;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+      a.click()
+    },
+    /** 生成违规描述 */
+    createDescribe() {
+      this.rules.companyName = [{
+        required: true,
+        message: "必填",
+        trigger: "blur"
+      }]
+      this.rules.projectName = [{
+        required: true,
+        message: "必填",
+        trigger: "blur"
+      }]
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let formData = this.form;
+          const now = new Date();
+          const year = now.getFullYear();
+          const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
+          const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
+          const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
+          const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
+          const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
+          const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
+          this.form.describe = code + formData.companyName + "在" + formData.projectName + "出现" + formData
+            .violationType;
+          this.rules.companyName = null;
+          this.rules.projectName = null;
+        }
+      });
+
+    }
+  }
+};
@@ -137,7 +137,7 @@
     </el-row>
-    <el-row class="bd_left bd_right bd_bottom" v-if="signData.sign1">
+    <el-row class="bd_left bd_right bd_bottom" v-if="signData && signData.sign1">
       <el-col :span="1" class="bd_padding bd_right"  >部门意见</el-col>
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
@@ -147,7 +147,7 @@
       </el-col>
     </el-row>
-    <el-row class="bd_left bd_right bd_bottom"  v-if="signData.sign2">
+    <el-row class="bd_left bd_right bd_bottom"  v-if="signData && signData.sign2">
       <el-col :span="1" class="bd_padding bd_right">主管领导意见</el-col>
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign2Text}}</el-row>
@@ -157,7 +157,7 @@
       </el-col>
     </el-row>
-    <el-row class="bd_left bd_right"  v-if="signData.sign3">
+    <el-row class="bd_left bd_right"  v-if="signData && signData.sign3">
       <el-col :span="1" class="bd_padding bd_right">分管领导意见</el-col>
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
@@ -167,7 +167,7 @@
       </el-col>
     </el-row>
-    <el-row class="bd_left bd_right" style="border: 1px solid black;"  v-if="signData.sign4">
+    <el-row class="bd_left bd_right" style="border: 1px solid black;"  v-if="signData && signData.sign4">
       <el-col :span="1" class="bd_right bd_padding">渣土事务中心负责人意见</el-col>
         <el-col :span="23" >
           <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
@@ -265,7 +265,7 @@
       <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
       <el-input v-model="form.advice" placeholder="请填写审批意见" type="textarea" :rows="3"/>
       <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
       </div>
     </el-dialog>
@@ -887,7 +887,6 @@ export default {
           })
           return;
         } else {
-          if (value == 0) {
             let postData = {};
             postData.tableName = this.businessKey;
@@ -901,13 +900,7 @@ export default {
               });
             });
-          } else {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.violationCaseFile = false;
-              this.getList();
-            });
-          }
+
         }
       }
       if (this.definitionKey == "violation_warning") {
@@ -923,9 +916,7 @@ export default {
           })
           return;
         } else {
-          if (value == 0) {
             let postData = {};
-
             postData.tableName = this.businessKey;
             postData.replyImg = this.form.replyImg;
             postData.reply = this.form.reply;
@@ -937,13 +928,7 @@ export default {
               });
             });
-          } else {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.violationCaseFile1 = false;
-              this.getList();
-            });
-          }
+
         }
       }
@@ -18,7 +18,7 @@
                           filterable
                           reserve-keyword
                           placeholder="运输企业"
-                          
+
                           size="small"
                           :loading="loading">
                         <el-option
@@ -34,7 +34,7 @@
             <el-select v-model="queryParams.place" placeholder="所属区域"
                           filterable
                           reserve-keyword
-                          
+
                           size="small"
                           :loading="loading">
                         <el-option
@@ -166,251 +166,6 @@
   </div>
 </template>
-<script>
-  import {
-    listCredit,
-    getCredit,
-    delCredit,
-    addCredit,
-    updateCredit,
-    exportCredit,
-    getNames,
-    getPlaces,
-    historyCredit
-  } from "@/api/business/company";
-
-  import {
-    companyList,
-    updateCompany,
-  } from "@/api/dict";
-
-
-  export default {
-    name: "Credit",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        infoDialog :false,
-        // 总条数
-        total: 0,
-        // 工地表格数据
-        creditList: [],
-        creditListInfo: [],
-        companyList:[],
-        dictNames:[],
-        dictPlaces:[],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        isEdit:false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          name: null,
-          time: null,
-          place: null,
-          reason: null,
-          status: 0,
-          lostCredit: 1
-        },
-        // 表单参数
-        form: {},
-        updateForm:{},
-        // 表单校验
-        rules: {
-          name: [
-            { required: true, message: '请选择运输企业', trigger: 'change' },
-          ],
-          reason: [
-            { required: true, message: '请填写原因', trigger: 'change' },
-          ],
-        },
-        rules2: {
-          reason: [
-            { required: true, message: '请填写原因', trigger: 'change' },
-          ],
-        },
-      };
-    },
-    created() {
-      this.init();
-    },
-    methods: {
-      init(){
-        this.resetQuery();
-          this.getList();
-          getNames(this.queryParams).then(response => {
-            this.dictNames = response;
-          });
-          getPlaces(this.queryParams).then(response => {
-            this.dictPlaces = response;
-          });
-
-          let query = {
-            'page':1,
-            'size':9999,
-            'creditStatus':0
-          }
-          companyList(query).then(response => {
-
-            this.companyList = response.result.list;
-          });
-      },
-      getDataInfo(row){
-        let param ={"objectId":row.objectId}
-
-        listCredit(param).then(response => {
-          this.creditListInfo = response.rows;
-          this.infoDialog = true;
-        });
-      },
-      getData(stauts){
-        this.queryParams.status=0;
-        this.queryParams.lostCredit=stauts;
-        this.getList();
-      },
-      getHistoryData(){
-        this.queryParams.status=1;
-        this.getList();
-      },
-      colStyle(obj){
-        if(obj.column.property == "id"){
-          return {background:"#f8f8f9"}
-        }
-      },
-      getObjId(a){
-        this.form.objectId = a.id;
-        this.form.place = a.areaName;
-      },
-      getList() {
-        this.loading = true;
-        if(this.queryParams.status==0){
-          listCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-        if(this.queryParams.status==1){
-          historyCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
+<script src="../../../api/company_credit.js" />
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.isEdit = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          name: null,
-          time: null,
-          place: null,
-          reason: null,
-          lostCredit: null,
-          objectId: null,
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        console.log(this.queryParams);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "企业信息录入";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCredit(id).then(response => {
-          this.form = response.data;
-          this.isEdit = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        if(this.isEdit){
-          this.$refs["updateForm"].validate(valid => {
-            if (valid) {
-              this.loading = true;
-                this.form.lostCredit = 0;
-                this.updateForm.id = this.form.id;
-                let data = [{id:this.form.objectId,dishonestState:this.form.lostCredit}];
-                updateCompany(data).then(res=>{
-                  updateCredit(this.updateForm).then(response => {
-                    this.msgSuccess("撤销成功");
-                    this.isEdit = false;
-                    this.updateForm = {};
-                    this.init();
-                  });
-                });
-            }
-          });
-        }else{
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-              this.loading = true;
-                this.form.lostCredit = 1;
-                let data = [{id:this.form.objectId,dishonestState:this.form.lostCredit}];
-                updateCompany(data).then(res=>{
-                  addCredit(this.form).then(response => {
-                    this.msgSuccess("新增成功");
-                    this.open = false;
-                    this.init();
-                  });
-                });
-            }
-          });
-        }
-      },
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有企业数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCredit(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
@@ -140,7 +140,7 @@
       </div>
     </el-dialog>
-    <el-dialog title="历史失信" :visible.sync="infoDialog" width="300px" append-to-body>
+    <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body>
       <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="失信时间" align="center" prop="time" width="180" />
@@ -155,296 +155,4 @@
   </div>
 </template>
-<script>
-  import {
-    listCredit,
-    getCredit,
-    delCredit,
-    addCredit,
-    updateCredit,
-    exportCredit,
-    getNames,
-    getTypes,
-    getPlaces,
-    historyCredit
-  } from "@/api/business/constructionsites";
-
-  import {
-    constructionsitesList,
-    getDict,
-    getArea,
-    updateConstructionsites
-  } from "@/api/dict";
-
-  export default {
-    name: "ConstructionCredit",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        infoDialog: false,
-        // 总条数
-        total: 0,
-        // 工地表格数据
-        creditList: [],
-        creditListInfo: [],
-        dictNames: [],
-        dictTypes: [],
-        dictPlaces: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        isEdit: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          name: null,
-          type: null,
-          time: null,
-          place: null,
-          reason: null,
-          status: 0,
-          lostCredit: 1,
-        },
-        // 表单参数
-        form: {
-        },
-        updateForm: {},
-        //建筑垃圾类型集合
-        trashTypes: [],
-        constructionList: [],
-        // 表单校验
-        rules: {
-          name: [{
-            required: true,
-            message: '请选择工地',
-            trigger: 'change'
-          }, ],
-          reason: [{
-            required: true,
-            message: '请填写原因',
-            trigger: 'change'
-          }, ]
-        },
-        areas:[],
-      };
-
-
-    },
-    created() {
-
-      getArea().then(res => {
-          this.areas = res.result;
-      });
-
-      getDict({'type': 'CSDisSiteDisposalType'}).then(response => {
-        this.trashTypes = response.result;
-      });
-
-      this.init();
-
-    },
-    methods: {
-      init(){
-        this.reset();
-        this.resetQuery();
-        this.getList();
-        this.getNamesData();
-        this.getTypesData();
-        this.getPlacesData();
-
-        let query = {
-          'page': 1,
-          'size': 9999,
-          'creditStatus': 0
-        };
-        constructionsitesList(query).then(response => {
-          this.constructionList = response.result.list
-        });
-      },
-      getList() {
-        this.loading = true;
-        if (this.queryParams.status == 0) {
-          listCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-        if (this.queryParams.status == 1) {
-          historyCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-      },
-      getDataInfo(row) {
-        let param = {
-          "objectId": row.objectId
-        }
-        listCredit(param).then(response => {
-          this.creditListInfo = response.rows;
-          this.infoDialog = true;
-        });
-      },
-      getNamesData() {
-        getNames(this.queryParams).then(response => {
-          this.dictNames = response;
-        });
-      },
-      getTypesData() {
-         getTypes(this.queryParams).then(response => {
-          this.dictTypes = response;
-        });
-      },
-      getPlacesData() {
-        getPlaces(this.queryParams).then(response => {
-          this.dictPlaces = response;
-        });
-      },
-      getData(stauts) {
-        this.queryParams.status = 0;
-        this.queryParams.lostCredit = stauts;
-        this.init();
-      },
-      getHistoryData() {
-        this.queryParams.status = 1;
-        this.init();
-      },
-      colStyle(obj) {
-        if (obj.column.property == "id") {
-          return {
-            background: "#f8f8f9"
-          }
-        }
-      },
-      getObjId(object) {
-
-        this.form.objectId = object.id;
-
-        for(let i in this.areas){
-          if(this.areas[i].code == Number(object.areaCode)){
-            this.form.place = this.areas[i].name;
-            break;
-          }
-        }
-        for(let i in this.trashTypes){
-          if(this.trashTypes[i].code == Number(object.cargoId)){
-            this.form.type = this.trashTypes[i].name;
-            break;
-          }
-        }
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.isEdit = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          name: null,
-          type: null,
-          time: null,
-          place: null,
-          reason: null,
-          lostCredit: null,
-          objectId: null,
-        };
-        this.updateForm = {
-          reason:null,
-        };
-        this.resetForm("updateForm");
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        console.log(this.queryParams);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加工地";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCredit(id).then(response => {
-          this.form = response.data;
-          this.isEdit = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-              this.loading = true;
-            if (this.form.id != null) {
-              this.form.lostCredit = 0;
-              let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-
-              updateConstructionsites(data).then(response=>{
-                  this.updateForm.id = this.form.id;
-                  updateCredit(this.updateForm).then(response => {
-                    this.msgSuccess("撤销成功");
-                    this.isEdit = false;
-                    this.init();
-                  });
-                });
-            } else {
-              this.form.lostCredit = 1;
-              let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-              updateConstructionsites(data).then(response=>{
-                addCredit(this.form).then(response => {
-                  this.msgSuccess("新增成功");
-                  this.open = false;
-                  this.init();
-                });
-              });
-            }
-          }
-        });
-      },
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有工地数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCredit(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
+<script src="../../../api/construction_credit.js" />
@@ -16,7 +16,7 @@
                         style="float:right;">
             <el-select v-model="queryParams.name"
                        filterable
-                       
+
                        reserve-keyword
                        placeholder="驾驶员姓名"
                        size="small"
@@ -87,9 +87,9 @@
             v-model="form.name"
             filterable
             reserve-keyword
-            placeholder="驾驶员姓名">
+            placeholder="驾驶员姓名"
+            @change="getObjId">
             <el-option
-              @click.native="getObjId(item)"
               v-for="item in driverList"
               :key="item.id"
               :label="item.name"
@@ -142,254 +142,4 @@
   </div>
 </template>
-<script>
-import {
-  listCredit,
-  getCredit,
-  delCredit,
-  addCredit,
-  updateCredit,
-  exportCredit,
-  getNames,
-  historyCredit
-} from "@/api/business/driver";
-
-import {
-  companyList,
-  driverList
-} from "@/api/dict";
-
-export default {
-  name: "ConstructionCredit",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      infoDialog :false,
-      // 总条数
-      total: 0,
-      // 工地表格数据
-      creditList: [],
-      creditListInfo: [],
-      dictNames:[],
-      dictTypes:[],
-      dictPlaces:[],
-      driverList:[],
-      names:[],
-      idNumbers:[],
-      places:[],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      isEdit:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        idNumber: null,
-        time: null,
-        reason: null,
-        status: 0,
-        lostCredit: 1
-      },
-      // 表单参数
-      form: {},
-      updateForm:{},
-      // 表单校验
-      rules: {name: [
-          { required: true, message: '请选择驾驶员', trigger: 'change' },
-        ],reason: [
-          { required: true, message: '请填写原因', trigger: 'change' },
-        ]}
-    };
-  },
-  created() {
-    this.init();
-  },
-  methods: {
-    init(){
-      this.reset();
-
-        this.resetQuery();
-        this.getList();
-        this.getNamesData();
-
-      let query = {
-        'page':1,
-        'size':9999,
-        'creditStatus':0
-      }
-
-      companyList(query).then(response => {
-
-        let companys = response.result.list;
-
-        let ids = [];
-
-        for(let i = 0 ;i<companys.length;i++){
-          ids.push(companys[i].id);
-        }
-        query.companyIds = ids + "";
-        query.status = 3;
-
-        driverList(query).then(res=>{
-
-          this.driverList = res.result;
-
-        });
-
-      });
-    },
-    getDataInfo(row){
-      let param ={"objectId":row.objectId}
-      listCredit(param).then(response => {
-        this.creditListInfo = response.rows;
-        this.infoDialog = true;
-      });
-
-    },
-    getNamesData(){
-      getNames(this.queryParams).then(response => {
-        this.dictNames = response;
-      });
-    },
-    getData(stauts){
-      this.queryParams.status=0;
-      this.queryParams.lostCredit=stauts;
-      this.getList();
-    },
-    getHistoryData(){
-      this.queryParams.status=1;
-      this.init();
-    },
-    colStyle(obj){
-      if(obj.column.property == "id"){
-        return {background:"#f8f8f9"}
-      }
-    },
-    getObjId(a){
-      this.form.objectId = a.id;
-      this.form.idNumber = a.identityNo;
-    },
-    getList() {
-      this.loading = true;
-      if(this.queryParams.status==0){
-        listCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-      if(this.queryParams.status==1){
-        historyCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.isEdit = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        idNumber: null,
-        time: null,
-        reason: null,
-        lostCredit: null,
-        objectId: null,
-      };
-      this.updateForm = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      console.log(this.queryParams);
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加驾驶员";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCredit(id).then(response => {
-        this.form = response.data;
-        this.isEdit = true;
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if(this.open){
-        this.updateForm.reason = "1";
-      }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-
-            this.loading = true;
-          if (this.form.id != null) {
-            this.updateForm.id = this.form.id;
-            updateCredit(this.updateForm).then(response => {
-              this.msgSuccess("撤销成功");
-              this.isEdit = false;
-              this.init();
-            });
-          } else {
-            this.form.lostCredit = 1;
-            addCredit(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.init();
-            });
-          }
-        }
-      });
-    },
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有驾驶员数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return exportCredit(queryParams);
-      }).then(response => {
-        this.download(response.message);
-      })
-    }
-  }
-};
-</script>
+<script src="../../../api/driver_credit.js" />
@@ -158,263 +158,4 @@
   </div>
 </template>
-<script>
-import {
-  listCredit,
-  getCredit,
-  delCredit,
-  addCredit,
-  updateCredit,
-  exportCredit,
-  getNames,
-  getTypes,
-  getPlaces,
-  historyCredit
-} from "@/api/business/earthsites";
-
-import {
-  earthsitesList,
-  updateEarthsites
-} from "@/api/dict";
-
-import requestRemote from '@/utils/requestRemote'
-
-export default {
-  name: "EarthSitesCredit",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      infoDialog :false,
-      // 总条数
-      total: 0,
-      // 工地表格数据
-      creditList: [],
-      creditListInfo: [],
-      earthsitesList:[],
-      dictNames:[],
-      dictTypes:[],
-      dictPlaces:[],
-      names:[],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      isEdit:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        type: null,
-        time: null,
-        place: null,
-        reason: null,
-        status: 0,
-        lostCredit: 1
-      },
-      // 表单参数
-      form: {},
-      updateForm:{},
-      // 表单校验
-      rules: {name: [
-          { required: true, message: '请选择消纳场', trigger: 'change' },
-        ],reason: [
-          { required: true, message: '请填写原因', trigger: 'change' },
-        ]}
-    };
-  },
-  created() {
-    this.init();
-  },
-  methods: {
-    init(){
-        this.resetQuery();
-      this.reset();
-      this.getList();
-      this.getNamesData();
-      this.getTypesData();
-      this.getPlacesData();
-
-      let query = {
-        'page': 1,
-        'size': 9999,
-        'creditStatus': 0
-      };
-      earthsitesList(query).then(response => {
-        this.earthsitesList = response.result.list
-      });
-    },
-    getDataInfo(row){
-      let param ={"objectId":row.objectId}
-      listCredit(param).then(response => {
-        this.creditListInfo = response.rows;
-        this.infoDialog = true;
-      });
-
-    },
-    getNamesData(){
-      getNames(this.queryParams).then(response => {
-        this.dictNames = response;
-      });
-    },
-    getTypesData() {
-       getTypes(this.queryParams).then(response => {
-        this.dictTypes = response;
-      });
-    },
-    getPlacesData() {
-      getPlaces(this.queryParams).then(response => {
-        this.dictPlaces = response;
-      });
-    },
-    getData(stauts){
-      this.queryParams.status=0;
-      this.queryParams.lostCredit=stauts;
-      this.init();
-    },
-    getHistoryData(){
-      this.queryParams.status=1;
-      this.init();
-    },
-    colStyle(obj){
-      if(obj.column.property == "id"){
-        return {background:"#f8f8f9"}
-      }
-    },
-    getObjId(a){
-      this.form.objectId = a.id;
-      this.form.place = a.areaName;
-      this.form.type = a.typeName;
-    },
-    getList() {
-      this.loading = true;
-      if(this.queryParams.status==0){
-        listCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-      if(this.queryParams.status==1){
-        historyCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.isEdit = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        type: null,
-        time: null,
-        place: null,
-        reason: null,
-        lostCredit: null,
-        objectId: null,
-      };
-      this.updateForm = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      console.log(this.queryParams);
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加消纳场";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCredit(id).then(response => {
-        this.form = response.data;
-        this.isEdit = true;
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-        if(this.open){
-          this.updateForm.reason = "1";
-        }
-
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-        this.loading = true;
-          if (this.form.id != null) {
-            this.form.lostCredit = 0;
-            let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-            updateEarthsites(data).then(res=>{
-              this.updateForm.id = this.form.id;
-              updateCredit(this.updateForm).then(response => {
-                this.msgSuccess("撤销成功");
-                this.isEdit = false;
-
-                this.init();
-              });
-            });
-          } else {
-            this.form.lostCredit = 1;
-            let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-            updateEarthsites(data).then(res=>{
-              addCredit(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-
-                this.init();
-              });
-            });
-
-          }
-        }
-      });
-    },
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有消纳场数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return exportCredit(queryParams);
-      }).then(response => {
-        this.download(response.message);
-      })
-    }
-  }
-};
-</script>
+<script src="../../../api/earthsites_credit.js" />
@@ -145,288 +145,4 @@
   </div>
 </template>
-<script>
-  import {
-    listCredit,
-    getCredit,
-    delCredit,
-    addCredit,
-    updateCredit,
-    exportCredit,
-    getNames,
-    getCompanys,
-    historyCredit
-  } from "@/api/business/truck";
-
-
-  import {
-    companyList,
-    truckList,
-    updateTruck
-  } from "@/api/dict";
-
-  export default {
-    name: "Credit",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        infoDialog: false,
-        // 总条数
-        total: 0,
-        // 工地表格数据
-        creditList: [],
-        creditListInfo: [],
-        dictNames: [],
-        dictCompanys: [],
-        companyList:[],
-        truckList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        isEdit: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          companyId: null,
-          licensePlate: null,
-          time: null,
-          reason: null,
-          status: 0,
-          lostCredit: 1
-        },
-        // 表单参数
-        form: {},
-        updateForm: {},
-        // 表单校验
-        rules: {
-          companyId: [{
-            required: true,
-            message: '请选择运输公司',
-            trigger: 'change'
-          }, ],
-          reason: [{
-            required: true,
-            message: '请填写原因',
-            trigger: 'change'
-          }, ],
-          licensePlate: [{
-            required: true,
-            message: '请选择车辆',
-            trigger: 'change'
-          }],
-        },
-        rules2: {
-          reason: [{
-            required: true,
-            message: '请填写原因',
-            trigger: 'change'
-          }, ],
-        }
-      };
-    },
-    created() {
-      this.init();
-    },
-    methods: {
-
-      init() {
-        this.resetQuery();
-        this.getList();
-        getNames(this.queryParams).then(response => {
-           this.dictNames = response;
-        });
-
-         getCompanys(this.queryParams).then(response => {
-           this.dictCompanys = response;
-        });
-
-          let query = {
-            'page':1,
-            'size':9999,
-            'dishonestState':0
-          }
-        companyList(query).then(response => {
-
-          let companys = response.result.list;
-          this.companyList = companys;
-          let ids = [];
-
-          for(let i = 0 ;i<companys.length;i++){
-            ids.push(companys[i].id);
-          }
-          query.companyID = ids + "";
-          query.valid = 0;
-
-          truckList(query).then(res=>{
-            this.truckList = res.result.list;
-          });
-
-        });
-
-
-      },
-      getDataInfo(row) {
-        console.log(row);
-
-        let param = {
-          "objectId": row.objectId
-        }
-
-        listCredit(param).then(response => {
-          this.creditListInfo = response.rows;
-          this.infoDialog = true;
-        });
-
-      },
-      getData(stauts) {
-        this.queryParams.status = 0;
-        this.queryParams.lostCredit = stauts;
-        this.init();
-      },
-      getHistoryData() {
-        this.queryParams.status = 1;
-        this.init();
-      },
-      colStyle(obj) {
-        if (obj.column.property == "id") {
-          return {
-            background: "#f8f8f9"
-          }
-        }
-      },
-      getObjId(a) {
-        this.form.companyId = a.companyName;
-        this.form.objectId = a.id;
-      },
-      getList() {
-        this.loading = true;
-        if (this.queryParams.status == 0) {
-          listCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-        if (this.queryParams.status == 1) {
-          historyCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.isEdit = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          companyId: null,
-          licensePlate: null,
-          time: null,
-          reason: null,
-          status: null,
-          lostCredit: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        console.log(this.queryParams);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "车辆失信录入";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCredit(id).then(response => {
-          this.form = response.data;
-          this.isEdit = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        if(this.isEdit){
-          this.$refs["updateForm"].validate(valid => {
-            if (valid) {
-                this.loading = true;
-                this.form.lostCredit = 0;
-                this.updateForm.id = this.form.id;
-              let data = [{creditStatus:this.form.lostCredit,id:this.form.objectId}];
-              updateTruck(data).then(res=>{
-                updateCredit(this.updateForm).then(response => {
-                  this.msgSuccess("撤销成功");
-                  this.isEdit = false;
-                  this.updateForm = {};
-                  this.init();
-                });
-                });
-            }
-          });
-        }else{
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-                this.loading = true;
-                this.form.lostCredit = 1;
-                this.form.createType = 0;
-                  let data = [{creditStatus:this.form.lostCredit,id:this.form.objectId}];
-                  updateTruck(data).then(res=>{
-                    addCredit(this.form).then(response => {
-                      this.msgSuccess("新增成功");
-                      this.open = false;
-                      this.init();
-                    });
-                  });
-            }
-          });
-        }
-      },
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有车辆数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCredit(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
+<script src="../../../api/truck_credit.js" />
@@ -89,453 +89,4 @@
 </template>
-<script>
-  import {
-    dayWorkList,
-    exportDayWorkList,
-    exportDayWorkHistoryList
-  } from "@/api/business/daywork";
-
-
-  import {
-    Upload
-  } from "element-ui";
-  import {
-    getToken
-  } from "@/utils/auth";
-
-  import {
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-    getArea
-  } from "@/api/dict";
-
-  export default {
-    name: "dayWorkReport",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-
-        reUpdate : false,
-
-        info: false,
-
-        infoData: null,
-        businessKey:null,
-        picSample: false,
-        uploadImageDialog: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 开工报表表格数据
-        threestepList: [],
-        fileList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          workStartTime:null,
-          workEndTime:null,
-          name:null,
-          earthsitesName:null,
-          place:null,
-          subReason:null,
-        },
-        // 表单参数
-        form: {
-        },
-        picIndex: null,
-        // 表单校验
-        rules: {
-        },
-        SiteWorkAreaCodeType: [],
-        remoteData: [{name:"a",id:"id"}],
-        remoteQueryData: {
-          "page": 1,
-          "size": 9999
-        },
-        areas: [{
-          code:"a",
-          name:"A"}
-        ],
-        constructionsitesList:[],
-        earthsitesList:[],
-        areaCode: null,
-        bindData: [{name:"a",id:"id"}],
-        bindname:null,
-        projectTypes:null,
-        earthsitesTypes:null,
-        dayWorkCount:null,
-        outside:["长沙县","望城区","浏阳市","宁乡市","株洲市","湘潭市","汩罗市","湘阴县"],
-      };
-    },
-    created() {
-      this.getList(0);
-      getDict({type:"CSConsSiteProjectType"}).then(res=>{
-        this.projectTypes = res.result;
-      });
-
-      getDict({type:"CSDisSiteType"}).then(res=>{
-        this.earthsitesTypes = res.result;
-      });
-    },
-    methods: {
-      areaClear() {
-        this.areaCode = null;
-      },
-      selectArea(a) {
-        this.areaCode = a;
-      },
-      getObjId(item) {
-        if (this.form.type == 0) {
-          this.form.objectId = item.id;
-          this.form.place = Number(item.areaCode);
-        } else {
-          this.form.earthsitesId = item.id;
-          this.form.place = Number(item.areaCode);
-        }
-      },
-      getEarthsiteId(item) {
-        if (this.form.type == 0) {
-          this.form.objectId = item.id;
-        } else {
-            this.form.earthsitesId = item.id;
-        }
-      },
-      handleClose() {
-        this.uploadImageDialog = false;
-        this.fileList = [];
-      },
-      /** 查询开工报表列表 */
-      getList(tabIdx) {
-
-        this.loading = true;
-
-        // let query = this.queryParams;
-
-        if(tabIdx == 1){
-          this.resetQuery();
-          this.queryParams.his = tabIdx;
-        }else if(tabIdx==0){
-          this.resetQuery();
-          this.queryParams.his = tabIdx;
-        }
-
-          dayWorkList(this.queryParams).then(response => {
-
-            this.threestepList = response.rows;
-
-            getArea().then(res => {
-              this.areas = res.result;
-              for(let i =0;i< this.threestepList.length;i++){
-                this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
-                if(this.outside.indexOf(this.threestepList[i].place) > -1){
-                  if(this.threestepList[i].status == "开工"){
-                    this.threestepList[i].estatus =  "开工";
-                    this.threestepList[i].eselfCheckTime =  this.threestepList[i].selfCheckTime;
-                    this.threestepList[i].descript = "开工";
-                  }
-                }
-              }
-            });
-
-            constructionsitesList(this.remoteQueryData).then(res => {
-              this.constructionsitesList = res.result.list;
-
-              let count = 0;
-              let count1 = 0;
-
-              for(let i =0;i< this.threestepList.length;i++){
-
-                if(this.threestepList[i].status == "开工"){
-                  count += 1;
-                }
-                if(this.threestepList[i].estatus == "开工"){
-                  count1 += 1;
-                }
-                for(let j =0;j<this.constructionsitesList.length;j++){
-                  if(this.threestepList[i].objectId == this.constructionsitesList[j].id){
-                    for(let x in this.projectTypes){
-                      if(this.projectTypes[x].code == this.constructionsitesList[j].projectType){
-                        this.threestepList[i].type = this.projectTypes[x].name;
-                      }
-                    }
-                  }
-                }
-              }
-
-               let str = "今日";
-              if(this.queryParams.his){
-                str = "";
-              }
-
-              let area = "长沙市";
-              let area1 = "长沙市";
-
-              if(this.queryParams.place){
-                area = this.getAreaName(this.queryParams.place)
-              }
-
-
-              if(this.queryParams.subReason){
-                area1 = this.getAreaName(this.queryParams.subReason)
-              }
-
-
-                this.dayWorkCount = str + area +"工地开工数量:" + count + "  " + str + area1   +"消纳场开工数量:" + count1;
-                this.loading = false;
-            });
-
-            earthsitesList(this.remoteQueryData).then(res => {
-              this.earthsitesList = res.result.list;
-              for(let i =0;i< this.threestepList.length;i++){
-                for(let j =0;j<this.earthsitesList.length;j++){
-                  if(this.threestepList[i].eid == this.earthsitesList[j].id){
-                        this.threestepList[i].etype = this.earthsitesList[j].typeName;
-                        this.threestepList[i].eplace = this.earthsitesList[j].areaName;
-                  }
-                }
-              }
-                this.loading = false;
-            });
-
-            this.total = response.total;
-          });
-
-
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          name: null,
-          type: null,
-          place: null,
-          selfCheckTime: null,
-          objectId: null,
-          earthsitesId: null,
-          createTime: null,
-          checkTime: null,
-          earthsitesName: null,
-          contract: null,
-          companys: null,
-          companyTrucks: null,
-          img0: null,
-          img1: null,
-          img2: null,
-          img3: null,
-          img4: null,
-          img5: null,
-          img6: null,
-          img7: null,
-          img8: null,
-          img9: null,
-          img10: null,
-          img11: null,
-          img12: null,
-          person: null,
-          phone: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.queryParams.workEndTime = null;
-        this.queryParams.workStartTime = null;
-        this.queryParams.subReason = null;
-        this.queryParams.place = null;
-        this.queryParams.earthsitesName = null;
-        this.queryParams.name = null;
-
-
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "报工自查";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-          this.reset();
-          this.businessKey = row.id +"";
-          this.info = true;
-      },
-      getAreaName(code){
-        for(let i =0;i<this.areas.length;i++){
-          if(Number(code) == this.areas[i].code){
-            return this.areas[i].name;
-            break;
-          }
-        }
-        return code;
-      },
-
-      reSub(row){
-        this.reset();
-
-        this.open = true;
-        this.title = "再次提交";
-        getThreestep(row.id).then(res=>{
-            this.form = res.data;
-            this.form.type = this.form.type + "";
-
-            for (let i = 0; i < 13; i++) {
-              if (this.form["img" + i]) {
-                this.form["img" + i] = this.form["img" + i].split(",");
-              }
-            }
-
-
-            this.form.status = 0;
-            this.form.id = null;
-        });
-
-
-
-      },
-
-      checkEndSuccess(){
-        this.form.checkEndTime = new Date();
-        this.form.id = this.businessKey;
-        for (let i = 1; i < 4; i++) {
-          if (this.form["attchItem" + i]) {
-            this.form["attchItem" + i] = this.form["attchItem" + i] + "";
-          }
-        }
-        this.submitForm();
-      },
-      checkEndError(){
-        console.log(this.form, this.businessKey);
-        //发起案卷
-      },
-
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateThreestep(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.open2 = false;
-                this.getList();
-              });
-            } 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] + "";
-                }
-              }
-              addThreestep(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.open2 = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除开工报表编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delThreestep(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-
-        let data = [];
-        let index = 1;
-        for(let i in this.threestepList){
-
-
-          let obj = {
-            id:index,
-            name:this.threestepList[i].name,
-            createTime:this.threestepList[i].createTime,
-            selfCheckTime:this.threestepList[i].selfCheckTime,
-            place:this.threestepList[i].place,
-            status:this.threestepList[i].status,
-            ename:this.threestepList[i].ename,
-            eplace:this.threestepList[i].eplace,
-            estatus:this.threestepList[i].estatus,
-            eselfCheckTime:this.threestepList[i].eselfCheckTime,
-            descript:this.threestepList[i].descript,
-          }
-
-          data.push(obj);
-          index += 1;
-
-        }
-        if(this.queryParams.his ==1){
-          this.$confirm('是否确认导出所有开工报表数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return exportDayWorkHistoryList(data);
-          }).then(response => {
-            this.download(response.message);
-          })
-        }else{
-          this.$confirm('是否确认导出所有开工报表数据项?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return exportDayWorkList(data);
-          }).then(response => {
-            this.download(response.message);
-          })
-        }
-
-
-      }
-    }
-  };
-</script>
+<script src="../../../api/dayWorkReport.js" />
@@ -20,9 +20,7 @@
           size="small" />
       </el-form-item>
       <el-form-item label="所属企业" prop="company">
-        <el-select v-model="form.projectName" :filterable="true" :remote-method="ConpanyNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">
-          <el-option v-for="item in truckActivateList" :label="item.company" :value="item.company"></el-option>
-        </el-select>
+        <el-input v-model="queryParams.company" />
       </el-form-item>
       <el-form-item label="激活状态" prop="activateStatus">
         <el-select v-model="queryParams.activateStatus" placeholder="请选择激活状态" size="small">
@@ -100,13 +98,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="所属企业" prop="company">
-            <el-select v-model="form.company" filterable reserve-keyword>
+            <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-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.indexOf(item.id) == -1"
+              <el-option  v-if="!form.company || form.company == item.companyName"
                         v-for="item in truckList"
                         :label="item.licenseplateNo"
                         :value="item.id"/>
@@ -50,164 +50,6 @@
       </el-form>
 </template>
-<script>
-import { listCaseOffline, getCaseOffline,getAdviceList } from "@/api/caseOffline/caseOffline";
-  import {
-    getArea,
-    earthsitesList,
-    constructionsitesList,
-    getDict,
+<script src="../../../api/caseOfflineInfo">
-  } from "@/api/dict";
-  import {
-    getThreestep,
-  } from "@/api/business/threestep";
-
-
-
-  import {
-    getToken
-  } from "@/utils/auth";
-export default {
-  name: "CaseOffline",
-  props: {
-    businessKey: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 线下交办案卷表格数据
-      caseOfflineList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      open2:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        type: null,
-        place: null,
-        createTime: null,
-      },
-      uploadImageDialog:false,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      caseType:[
-        {code:1,name:"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥"},
-        {code:2,name:"未洗车出场或者出场清洁不彻底"},
-        {code:3,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
-        {code:4,name:"非核准车辆进入渣土处置工地运输渣土"},
-        {code:5,name:"渣土处置工地未按规定时间开停工"},
-        {code:6,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
-        {code:7,name:"渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"}
-      ],
-      areas:null,
-      fileList:[],
-      areas: [],
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 设置上传的请求头部
-        headers: {
-          Authorization: "Bearer " + getToken()
-        },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
-
-      },
-      workflow:"workflow_caseoffline",
-      data:{},
-      adviceList:[],
-    };
-  },
-  created() {
-    this.handleUpdate();
-  },
-  methods: {
-    getSite(item){
-      this.form.objectId = item.id;
-    },
-   getAreaName(code){
-     for(let i =0;i<this.areas.length;i++){
-       if(Number(code) == this.areas[i].code){
-         return this.areas[i].name;
-         break;
-       }
-     }
-     return code;
-   },
-    getCaseType(type){
-      for(let i in this.caseType){
-
-
-        if(this.caseType[i].code==type)
-          return this.caseType[i].name
-      }
-    },
-    /** 修改按钮操作 */
-    handleUpdate() {
-      let id;
-      if(this.businessKey.split(":").length == 2){
-        id = this.businessKey.split(":")[1];
-      }else{
-        id = this.businessKey;
-      }
-
-      getCaseOffline(id).then(response => {
-        this.form = response.data;
-        if(this.form.attach && this.form.attach != "")
-          this.form.attach  = this.form.attach.split(",");
-
-        this.form.siteType = this.form.siteType + "";
-        this.form.type = this.getCaseType(this.form.type);
-        this.form.place = this.getAreaName(this.form.place);
-
-        getAdviceList(this.workflow+":"+id).then(res=>{
-            if(res.data){
-              if(res.data.advice1){
-                this.adviceList.push({name: res.data.advice1.create_by ,time:res.data.advice1.create_time,text:this.form.advice1})
-              }
-              if(res.data.advice2){
-                this.adviceList.push({name: res.data.advice2.create_by ,time:res.data.advice2.create_time,text:this.form.advice2})
-              }
-              if(res.data.advice3){
-                this.adviceList.push({name: res.data.advice3.create_by ,time:res.data.advice3.create_time,text:this.form.advice3})
-              }
-              if(res.data.advice4){
-                this.adviceList.push({name: res.data.advice4.create_by ,time:res.data.advice4.create_time,text:this.form.advice4})
-              }
-
-            }
-        });
-
-
-        this.open2 = true;
-      });
-
-
-    },
-  }
-};
 </script>
@@ -52,9 +52,6 @@
       <el-table-column label="案卷类型" align="center" prop="type" />
       <el-table-column label="所属区域" align="center" prop="place" />
       <el-table-column label="时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -113,7 +110,7 @@
         <el-form-item label="附件" prop="attach">
             <a style="color:blue;font-size: 12px;" @click="uploadImageDialog=true;">选择附件</a>
             <el-input v-model="form.attach" type="hidden"></el-input>
-            <a @click="downloadFile(img);" style="color: blue;" v-for="img,index in form.attach">附件 - {{index+1}}</a>
+            <div style="color: blue;" v-for="img,index in form.attach">附件 - {{index+1}}  <a @click="removeAttchItem()" style="color:red;">X</a></div>
         </el-form-item>
       </el-form>
@@ -145,343 +142,4 @@
   </div>
 </template>
-<script>
-import { listCaseOffline, getCaseOffline, delCaseOffline, addCaseOffline, updateCaseOffline, exportCaseOffline } from "@/api/caseOffline/caseOffline";
-
-
-
-  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-  import {
-    getArea,
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-  } from "@/api/dict";
-  import {
-    getThreestep,
-  } from "@/api/business/threestep";
-
-  import {
-    getToken
-  } from "@/utils/auth";
-export default {
-  name: "CaseOffline",
-
-  components: {
-    caseOfflineInfo
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 线下交办案卷表格数据
-      caseOfflineList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      open2:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        type: null,
-        place: null,
-        createTime: null,
-      },
-      uploadImageDialog:false,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      caseType:[
-        {code:0,name:"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥"},
-        {code:1,name:"未洗车出场或者出场清洁不彻底"},
-        {code:2,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
-        {code:3,name:"非核准车辆进入渣土处置工地运输渣土"},
-        {code:4,name:"渣土处置工地未按规定时间开停工"},
-        {code:5,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
-        {code:6,name:"渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
-        {code:7,name:"其他1"},
-        {code:8,name:"其他2"},
-        {code:9,name:"其他3"}
-      ],
-      areas:null,
-      fileList:[],
-      areas: [],
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 设置上传的请求头部
-        headers: {
-          Authorization: "Bearer " + getToken()
-        },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
-      },
-      data:{},
-      objId:null
-    };
-  },
-  created() {
-
-
-
-    this.getList();
-
-      if(window.location.search){
-        let businessKey = window.location.search.split("=")[1];
-          debugger;
-        if(window.location.search.split("=")[0] == "?businessKey"){
-          let id;
-          if(businessKey.split(":").length == 2){
-              id = businessKey.split(":")[1];
-            }else{
-              id = businessKey;
-            }
-
-            getThreestep(id).then(response => {
-              let data = response.data;
-
-              this.handleAdd();
-
-              this.form.siteType = data.type + "";
-              this.form.siteName = data.name;
-              this.form.place = Number(data.place);
-            });
-        }
-
-      }
-
-
-
-    let remoteQueryData = {
-      "page": 1,
-      "size": 9999
-    }
-
-    constructionsitesList(remoteQueryData).then(res => {
-       this.data[0]= res.result.list;
-    });
-
-    earthsitesList(remoteQueryData).then(res => {
-        this.data[1]= res.result.list;
-    });
-  },
-  methods: {
-    getSite(item){
-      this.form.objectId = item.id;
-    },
-    /** 查询线下交办案卷列表 */
-    getList() {
-      this.loading = true;
-      listCaseOffline(this.queryParams).then(response => {
-        this.caseOfflineList = response.rows;
-
-        for(let i in this.caseOfflineList){
-          this.caseOfflineList[i].type = this.getCaseType(this.caseOfflineList[i].type);
-
-        }
-
-        getArea().then(res => {
-            this.areas = res.result;
-            for(let i =0;i< this.caseOfflineList.length;i++){
-              this.caseOfflineList[i].place = this.getAreaName(this.caseOfflineList[i].place);
-            }
-          });
-
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.open2 = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        type: null,
-        siteName: null,
-        locationDec: null,
-        caseDec: null,
-        status: 0,
-        place: null,
-        number: null,
-        siteType: null,
-        objectId: null,
-        createTime: null,
-        createBy: null,
-        advice1: null,
-        advice2: null,
-        advice3: null,
-        advice4: null,
-          attach:[]
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-   getAreaName(code){
-     for(let i =0;i<this.areas.length;i++){
-       if(Number(code) == this.areas[i].code){
-         return this.areas[i].name;
-         break;
-       }
-     }
-     return code;
-   },
-    getCaseType(type){
-      for(let i in this.caseType){
-
-
-        if(this.caseType[i].code==type)
-          return this.caseType[i].name
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加线下交办案卷";
-
-      let date = new Date();
-
-
-      this.form.number = date.getFullYear()
-                          +""+((date.getMonth()+1) < 10 ? "0" + (date.getMonth()+1) : (date.getMonth()+1))
-                          +""+ ((date.getDate()) < 10 ? "0" + (date.getDate()) : (date.getDate()))
-                          +""+ ((date.getHours()) < 10 ? "0" + (date.getHours()) : (date.getHours()))
-                          +""+ ((date.getMinutes()) < 10 ? "0" + (date.getMinutes()) : (date.getMinutes()))
-                          +""+ ((date.getSeconds()) < 10 ? "0" + (date.getSeconds()*1000) : (date.getSeconds()*1000))
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.businessKey =row.id + "";
-      this.open2 = true;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.form.attach  = this.form.attach +"";
-          if (this.form.id != null) {
-            updateCaseOffline(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCaseOffline(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除线下交办案卷编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCaseOffline(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有线下交办案卷数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCaseOffline(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-    },
-    removeAttchItem(index, img) {
-      this.form.attach.splice(this.form.attach.indexOf(img), 1);
-      this.$forceUpdate();
-    },
-    uploadSuccess(res, file, fileList) {
-		if(res.code){
-			this.$message(res.message);
-			return;
-		}
-      if(!this.form.attach){
-        this.form.attach = [];
-      }
-      this.form.attach.push(res);
-    },
-    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;
-      }
-      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 (!isAccept) {
-        this.$message.error('应该选择PDF、JPG、WORD类型的文件')
-        return isAccept;
-      }
-    },
-      downloadFile(path) {
-        window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-      },
-      handleClose() {
-        this.uploadImageDialog = false;
-        this.fileList = [];
-      },
-  }
-};
-</script>
+<script src="../../../api/caseoffline.js" />
@@ -89,10 +89,7 @@
       </template>
       </el-table-column>
       <el-table-column label="违规类型" align="center" prop="violationType" />
-      <el-table-column label="审批状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span>{{parseStatus(scope.row.status) }}</span>
-        </template>
+      <el-table-column label="日期" align="center" prop="createTime">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -263,452 +260,5 @@
   </div>
 </template>
-<script>
-import { listViolationCaseFile, getViolationCaseFile,
-        delViolationCaseFile, addViolationCaseFile,
-        updateViolationCaseFile, exportViolationCaseFile } from "@/api/casefile/violationCaseFile";
-import violationCaseFileInfo from "./violationCaseFileInfo";
-
-  import {
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-    getArea,
-    companyList,
-    truckList,
-  } from "@/api/dict";
-
-
-export default {
-  name: "ViolationCaseFile",
-  components: { violationCaseFileInfo },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 平台违规案卷表格数据
-      violationCaseFileList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        status: null,
-        receive: null,
-        receiveStatus: null,
-        readBy: null,
-        readTime: null
-      },
-      // 表单参数
-      form: {
-
-      },
-      place:null,
-      // 表单校验
-      rules: {
-        number :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationObjectType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        owningRegion :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-      },
-      caseType:[{code:0,name:"进入非专用车辆"},
-      {code:1,name:"无许可手续（工）"},
-      {code:2,name:"无许可手续（消）"},
-      {code:3,name:"黄土覆盖情况"},
-      {code:4,name:"出入口路面污染"},
-      {code:5,name:"出入口道路硬化"},
-      {code:6,name:"车辆冲洗是否到位"},
-      {code:7,name:"雾炮机是否正常开启"},
-      {code:8,name:"使用费专用车运输"},
-      {code:9,name:"监控点位未对准"},
-      {code:10,name:"未报开工作业"},
-      {code:11,name:"视频设备离线超时报警"},
-      {code:12,name:"三无车辆进入工地"},
-      {code:13,name:"未按时间作业"},
-      {code:14,name:"未报开工作业"},
-      {code:15,name:"视频设备离线超时报警"},
-      {code:16,name:"三无车辆进入消纳场"},
-      {code:17,name:"未到指定的消纳场作业"},
-      {code:18,name:"离线运输报警（工）"},
-      {code:19,name:"离线运输报警（消）"},
-      {code:20,name:"未激活车辆作业"},
-      {code:21,name:"未核准作业车辆作业"},
-      {code:22,name:"未按线路行驶"},
-      {code:23,name:"闯禁行驶"},
-      {code:24,name:"失信车辆作业"},
-      {code:25,name:"其他1"},
-      {code:26,name:"其他2"},
-      {code:27,name:"其他3"},
-      {code:28,name:"其他4"},
-      {code:29,name:"其他5"}],
-
-      projectNameList:[
-      ],
-      isLoading: false,
-      fileEntityList:[],
-      companyList:[
-      ],
-      remoteQueryData: {
-        "page": 1,
-        "size": 9999
-      },
-      areas:[],
-      data:{},
-      isLoadingCompany: false,
-      idInfo:null,
-      openInfo:false,
-    };
-  },
-  created() {
-    getArea().then(res=>{
-
-      this.areas = res.result;
-    });
-
-
-    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]);
-         }
-      });
-    });
-
-
-    companyList(this.remoteQueryData).then(res => {
-       this.companyList = res.result.list;
-    });
-
-
-
-    this.getList();
-  },
-  methods: {
-    selectArea(item){
-
-      this.form.owningRegion = item.name;
-      this.form.projectName = null;
-
-    },
-    /** 查询平台违规案卷列表 */
-    getList() {
-      this.loading = true;
-      listViolationCaseFile(this.queryParams).then(response => {
-        this.violationCaseFileList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openInfo = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.fileEntityList = [];
-      this.form = {
-        id: null,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        status: 0,
-        receive: null,
-        receiveStatus: 0,
-        readBy: null,
-        readTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    handleInfo(row){
-      this.idInfo = row.id + "";
-      this.openInfo = true;
-      this.title = "平台违规案卷详情";
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.form.number = this.getNumber();
-      this.form.violationGrade = "一般类";
-      this.form.sendObject = "区管理部门(治)";
-      this.title = "添加平台违规案卷";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getViolationCaseFile(id).then(response => {
-        this.form = response.data.violationCaseFile;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
-        this.open = true;
-        this.title = "修改平台违规案卷";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-
-          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
-
-            this.$message("请选择相关企业");
-
-            return;
-          }
-
-
-          let formData = new FormData();
-          let form = this.form;
-          //去掉params属性
-          delete form.params;
-          formData.append('fileList', null);
-          //将新增的文件放入formData
-          this.fileEntityList.forEach(item => {
-            if(item.id==null){
-              formData.append('fileList', item.raw)
-            }
-          })
-          if (this.form.id != null) {
-            formData.append("violationCaseFile", JSON.stringify(form));
-            formData.append("uploadFilesList", null);
-            this.fileEntityList.forEach(item => {
-              delete item.params;
-              if(item != "null" && item != null){
-                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
-              }
-            })
-            updateViolationCaseFile(formData).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            for (let key in form) {
-              formData.append(key, form[key] == null ? "" : form[key])
-            }
-            addViolationCaseFile(formData).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除平台违规案卷编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delViolationCaseFile(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有平台违规案卷数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportViolationCaseFile(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-    },
-    /** 生成案卷编号 */
-    getNumber(){
-      const now = new Date();
-      const year = now.getFullYear().toString().slice(-2); // 提取后两位数
-      const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-      const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-      const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-      const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-      const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-      const millisecond = now.getMilliseconds();
-      const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
-      return code;
-    },
-    projectNameLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoading = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'项目1' },
-          { name:'项目2' },
-          { name:'项目3' }
-        ].filter(item => item.name.includes(query))
-        this.projectNameList = data
-        this.isLoading = false
-      }, 200)
-    },
-    companyLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoadingCompany = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'公司1' },
-          { name:'公司2' },
-          { name:'公司3' }
-        ].filter(item => item.name.includes(query))
-        this.companyList = data
-        this.isLoadingCompany = false
-      }, 200)
-    },
-    /**
-     * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
-     * 大小不超过20M
-     * */
-    fileChange(file, fileList) {
-      let count = 0;
-      for (let i = 0; i < fileList.length; i++) {
-        // console.log(fileList.length)
-        // console.log(this.fileEntityList[i].name+"111"+file.name)
-        if (fileList[i].name == file.name) {
-          count++;
-          if (count == 2) {
-            this.$message({
-              message: '已存在此文件！',
-              type: 'warning'
-            });
-            for (let j = fileList.length; j > 0; j--) {
-              //如果存在此文件，去除新选择的重复文件
-              if (fileList[j - 1].name == file.name) {
-                fileList.splice(j - 1, 1);
-                i--;
-                return false;
-              }
-            }
-          }
-        }
-      }
-      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
-      //格式符合后判断大小
-      if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
-        let max5M = file.size / 1024 / 1024 < 20;
-        if (!max5M) {
-          this.$message({
-            message: '上传文件大小不得超过20M！',
-            type: 'warning'
-          });
-          fileList = fileList.splice(fileList.length - 1, 1);
-        } else {
-          //符合条件后进行添加
-          this.fileEntityList = fileList
-        }
-      } else {
-        this.$message({
-          message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
-          type: 'warning'
-        });
-        fileList = fileList.splice(fileList.length - 1, 1);
-      }
-    },
-    // 删除文件
-    handleDeleteFile(index) {
-      this.fileEntityList.splice(index, 1);
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    /** 生成违规描述 */
-    createDescribe(){
-      this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let formData = this.form;
-          const now = new Date();
-          const year = now.getFullYear();
-          const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-          const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-          const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-          const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-          const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-          const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
-          this.rules.companyName = null;
-          this.rules.projectName = null;
-        }
-      });
-
-    }
-  }
-};
+<script src="../../../api/vio_casefile">
 </script>
@@ -251,428 +251,4 @@
   </div>
 </template>
-<script>
-import { listViolationWarningInformation, getViolationWarningInformation, delViolationWarningInformation, addViolationWarningInformation, updateViolationWarningInformation, exportViolationWarningInformation } from "@/api/casefile/violationWarningInformation";
-import violationWarningInformationInfo from "./violationWarningInformationInfo";
-import {
-  earthsitesList,
-  constructionsitesList,
-  getDict,
-  getArea,
-  companyList,
-  truckList,
-} from "@/api/dict";
-import {getEarthSitesList,getConstructionList,getCompanyList,getAreaList} from "@/api/casefile/remoteServer";
-export default {
-  name: "ViolationWarningInformation",
-  components: { violationWarningInformationInfo },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 违规预警信息表格数据
-      violationWarningInformationList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        receive: null,
-        receiveStatus: null,
-        readBy: null,
-        readTime: null,
-        replyOne: null,
-        replyTwo: null,
-        replyThree: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        number :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationObjectType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        owningRegion :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-      },
-      caseType:[{code:0,name:"工地预警-未报开工作业"},
-        {code:1,name:"工地预警-视频设备离线超时报警"},
-        {code:2,name:"工地预警-三无车辆进入工地"},
-        {code:3,name:"工地预警未按时间作业"},
-        {code:4,name:"消纳场预警-未报开工作业"},
-        {code:5,name:"消纳场预警-视频设备离线超时报警"},
-        {code:6,name:"消纳场预警-三无车辆进入消纳场"},
-        {code:7,name:"消纳场预警-未到指定的消纳场作业"},
-        {code:8,name:"离线运输报警(工)"},
-        {code:9,name:"离线运输报警(消)"},
-        {code:10,name:"未激活车辆作业"},
-        {code:11,name:"未核准作业车辆作业"},
-        {code:12,name:"未按线路行驶"},
-        {code:13,name:"闯禁行驶"},
-        {code:14,name:"失信车辆作业"}],
-      projectNameList:[
-      ],
-      isLoading: false,
-      fileEntityList:[],
-      companyList:[
-      ],
-      remoteQueryData: {
-        "page": 1,
-        "size": 9999
-      },
-      isLoadingCompany: false,
-      idInfo:null,
-      openInfo:false,
-      areas:[],
-      data:{},
-    };
-  },
-  created() {
-    getAreaList().then(res=>{
-      this.areas = res.data;
-    });
-
-
-    getEarthSitesList().then(res => {
-      for(var i in res.data){
-        this.projectNameList.push({name:res.data[i].name});
-      }
-    });
-    getConstructionList().then(res => {
-      for(var i in res.data){
-        this.projectNameList.push({name:res.data[i].name});
-      }
-    });
-
-
-    getCompanyList(this.remoteQueryData).then(res => {
-      this.companyList = res.data;
-    });
-    this.getList();
-  },
-  methods: {
-    selectArea(item){
-
-      this.form.owningRegion = item.name;
-
-    },
-    /** 查询违规预警信息列表 */
-    getList() {
-      this.loading = true;
-      listViolationWarningInformation(this.queryParams).then(response => {
-        this.violationWarningInformationList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openInfo = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.fileEntityList = [];
-      this.form = {
-        id: null,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        receive: null,
-        receiveStatus: 0,
-        readBy: null,
-        readTime: null,
-        replyOne: null,
-        replyTwo: null,
-        replyThree: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    handleInfo(row){
-      this.idInfo = row.id+"";
-      this.openInfo = true;
-      this.title = "平台违规案卷详情";
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.form.number = this.getNumber();
-      this.form.violationGrade = "一般类";
-      this.form.sendObject = "区管理部门(治)";
-      this.title = "添加违规预警信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getViolationWarningInformation(id).then(response => {
-        this.form = response.data.violationWarningInformation;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
-        this.open = true;
-        this.title = "修改违规预警信息";
-      });
-
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
-
-            this.$message("请选择相关企业");
-
-            return;
-          }
-          let formData = new FormData();
-          let form = this.form;
-          //去掉params属性
-          delete form.params;
-          formData.append('fileList', null);
-          //将新增的文件放入formData
-          this.fileEntityList.forEach(item => {
-            if(item.id==null){
-              formData.append('fileList', item.raw)
-            }
-          })
-          if (this.form.id != null) {
-            formData.append("violationWarningInformation", JSON.stringify(form));
-            formData.append("uploadFilesList", null);
-            this.fileEntityList.forEach(item => {
-              delete item.params;
-              if(item != "null" && item != null){
-                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
-              }
-            })
-            updateViolationWarningInformation(formData).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            for (let key in form) {
-              formData.append(key, form[key] == null ? "" : form[key])
-            }
-            addViolationWarningInformation(formData).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除违规预警信息编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delViolationWarningInformation(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportViolationWarningInformation(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-    },
-    /** 生成案卷编号 */
-    getNumber(){
-      const now = new Date();
-      const year = now.getFullYear().toString().slice(-2); // 提取后两位数
-      const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-      const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-      const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-      const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-      const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-      const millisecond = now.getMilliseconds();
-      const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
-      return code;
-    },
-    projectNameLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoading = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'项目1' },
-          { name:'项目2' },
-          { name:'项目3' }
-        ].filter(item => item.name.includes(query))
-        this.projectNameList = data
-        this.isLoading = false
-      }, 200)
-    },
-    companyLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoadingCompany = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'公司1' },
-          { name:'公司2' },
-          { name:'公司3' }
-        ].filter(item => item.name.includes(query))
-        this.companyList = data
-        this.isLoadingCompany = false
-      }, 200)
-    },
-    /**
-     * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
-     * 大小不超过20M
-     * */
-    fileChange(file, fileList) {
-      let count = 0;
-      for (let i = 0; i < fileList.length; i++) {
-        // console.log(fileList.length)
-        // console.log(this.fileEntityList[i].name+"111"+file.name)
-        if (fileList[i].name == file.name) {
-          count++;
-          if (count == 2) {
-            this.$message({
-              message: '已存在此文件！',
-              type: 'warning'
-            });
-            for (let j = fileList.length; j > 0; j--) {
-              //如果存在此文件，去除新选择的重复文件
-              if (fileList[j - 1].name == file.name) {
-                fileList.splice(j - 1, 1);
-                i--;
-                return false;
-              }
-            }
-          }
-        }
-      }
-      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
-      //格式符合后判断大小
-      if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
-        let max5M = file.size / 1024 / 1024 < 20;
-        if (!max5M) {
-          this.$message({
-            message: '上传文件大小不得超过20M！',
-            type: 'warning'
-          });
-          fileList = fileList.splice(fileList.length - 1, 1);
-        } else {
-          //符合条件后进行添加
-          this.fileEntityList = fileList
-        }
-      } else {
-        this.$message({
-          message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
-          type: 'warning'
-        });
-        fileList = fileList.splice(fileList.length - 1, 1);
-      }
-    },
-    // 删除文件
-    handleDeleteFile(index) {
-      this.fileEntityList.splice(index, 1);
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    /** 生成违规描述 */
-    createDescribe(){
-      this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let formData = this.form;
-          const now = new Date();
-          const year = now.getFullYear();
-          const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-          const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-          const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-          const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-          const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-          const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
-          this.rules.companyName = null;
-          this.rules.projectName = null;
-        }
-      });
-
-    }
-  }
-};
-</script>
+<script src="../../../api/warningInfo"></script>
 \ No newline at end of file
@@ -161,254 +161,4 @@
   </div>
 </template>
-<script>
-  import {
-    listCredit,
-    getCredit,
-    delCredit,
-    addCredit,
-    updateCredit,
-    exportCredit,
-    getNames,
-    getPlaces,
-    historyCredit
-  } from "@/api/business/company";
-
-  import {
-    companyList,
-    updateCompany,
-  } from "@/api/dict";
-
-  import pagination from '../Pagination';
-
-
-  export default {
-    name: "Credit",
-    components: {pagination},
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        infoDialog :false,
-        // 总条数
-        total: 0,
-        // 工地表格数据
-        creditList: [],
-        creditListInfo: [],
-        companyList:[],
-        dictNames:[],
-        dictPlaces:[],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        isEdit:false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          name: null,
-          time: null,
-          place: null,
-          reason: null,
-          status: 0,
-          lostCredit: 1
-        },
-        // 表单参数
-        form: {},
-        updateForm:{},
-        // 表单校验
-        rules: {
-          name: [
-            { required: true, message: '请选择运输企业', trigger: 'change' },
-          ],
-          reason: [
-            { required: true, message: '请填写原因', trigger: 'change' },
-          ],
-        },
-        rules2: {
-          reason: [
-            { required: true, message: '请填写原因', trigger: 'change' },
-          ],
-        },
-      };
-    },
-    created() {
-      this.init();
-    },
-    methods: {
-      init(){
-        this.resetQuery();
-          this.getList();
-          getNames(this.queryParams).then(response => {
-            this.dictNames = response;
-          });
-          getPlaces(this.queryParams).then(response => {
-            this.dictPlaces = response;
-          });
-
-          let query = {
-            'page':1,
-            'size':9999,
-            'creditStatus':0
-          }
-          companyList(query).then(response => {
-
-            this.companyList = response.result.list;
-          });
-      },
-      getDataInfo(row){
-        let param ={"objectId":row.objectId}
-
-        listCredit(param).then(response => {
-          this.creditListInfo = response.rows;
-          this.infoDialog = true;
-        });
-
-      },
-      getData(stauts){
-        this.queryParams.status=0;
-        this.queryParams.lostCredit=stauts;
-        this.getList();
-      },
-      getHistoryData(){
-        this.queryParams.status=1;
-        this.getList();
-      },
-      colStyle(obj){
-        if(obj.column.property == "id"){
-          return {background:"#f8f8f9"}
-        }
-      },
-      getObjId(a){
-        this.form.objectId = a.id;
-        this.form.place = a.areaName;
-      },
-      getList() {
-        this.loading = true;
-        if(this.queryParams.status==0){
-          listCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-        if(this.queryParams.status==1){
-          historyCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.isEdit = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          name: null,
-          time: null,
-          place: null,
-          reason: null,
-          lostCredit: null,
-          objectId: null,
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        console.log(this.queryParams);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "企业信息录入";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCredit(id).then(response => {
-          this.form = response.data;
-          this.isEdit = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        if(this.isEdit){
-          this.$refs["updateForm"].validate(valid => {
-            if (valid) {
-              this.loading = true;
-                this.form.lostCredit = 0;
-                this.updateForm.id = this.form.id;
-                let data = [{id:this.form.objectId,dishonestState:this.form.lostCredit}];
-                updateCompany(data).then(res=>{
-                  updateCredit(this.updateForm).then(response => {
-                    this.msgSuccess("撤销成功");
-                    this.isEdit = false;
-                    this.updateForm = {};
-                    this.init();
-                  });
-                });
-            }
-          });
-        }else{
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-              this.loading = true;
-                this.form.lostCredit = 1;
-                let data = [{id:this.form.objectId,dishonestState:this.form.lostCredit}];
-                updateCompany(data).then(res=>{
-                  addCredit(this.form).then(response => {
-                    this.msgSuccess("新增成功");
-                    this.open = false;
-                    this.init();
-                  });
-                });
-            }
-          });
-        }
-      },
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有企业数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCredit(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
+<script src="../../../api/company_credit.js" />
 \ No newline at end of file
@@ -164,299 +164,5 @@
   </div>
 </template>
-<script>
-  import {
-    listCredit,
-    getCredit,
-    delCredit,
-    addCredit,
-    updateCredit,
-    exportCredit,
-    getNames,
-    getTypes,
-    getPlaces,
-    historyCredit
-  } from "@/api/business/constructionsites";
-import pagination from '../Pagination';
-
-  import {
-    constructionsitesList,
-    getDict,
-    getArea,
-    updateConstructionsites
-  } from "@/api/dict";
-
-  export default {
-    name: "ConstructionCredit",
-    components: {pagination},
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        infoDialog: false,
-        // 总条数
-        total: 0,
-        // 工地表格数据
-        creditList: [],
-        creditListInfo: [],
-        dictNames: [],
-        dictTypes: [],
-        dictPlaces: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        isEdit: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          name: null,
-          type: null,
-          time: null,
-          place: null,
-          reason: null,
-          status: 0,
-          lostCredit: 1,
-        },
-        // 表单参数
-        form: {
-        },
-        updateForm: {},
-        //建筑垃圾类型集合
-        trashTypes: [],
-        constructionList: [],
-        // 表单校验
-        rules: {
-          name: [{
-            required: true,
-            message: '请选择工地',
-            trigger: 'change'
-          }, ],
-          reason: [{
-            required: true,
-            message: '请填写原因',
-            trigger: 'change'
-          }, ]
-        },
-        areas:[],
-      };
-
-
-    },
-    created() {
-
-      getArea().then(res => {
-          this.areas = res.result;
-      });
-
-      getDict({'type': 'CSDisSiteDisposalType'}).then(response => {
-        this.trashTypes = response.result;
-      });
-
-      this.init();
-
-    },
-    methods: {
-      init(){
-        this.reset();
-        this.resetQuery();
-        this.getList();
-        this.getNamesData();
-        this.getTypesData();
-        this.getPlacesData();
-
-        let query = {
-          'page': 1,
-          'size': 9999,
-          'creditStatus': 0
-        };
-        constructionsitesList(query).then(response => {
-          this.constructionList = response.result.list
-        });
-      },
-      getList() {
-        this.loading = true;
-        if (this.queryParams.status == 0) {
-          listCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-        if (this.queryParams.status == 1) {
-          historyCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-      },
-      getDataInfo(row) {
-        let param = {
-          "objectId": row.objectId
-        }
-        listCredit(param).then(response => {
-          this.creditListInfo = response.rows;
-          this.infoDialog = true;
-        });
-      },
-      getNamesData() {
-        getNames(this.queryParams).then(response => {
-          this.dictNames = response;
-        });
-      },
-      getTypesData() {
-         getTypes(this.queryParams).then(response => {
-          this.dictTypes = response;
-        });
-      },
-      getPlacesData() {
-        getPlaces(this.queryParams).then(response => {
-          this.dictPlaces = response;
-        });
-      },
-      getData(stauts) {
-        this.queryParams.status = 0;
-        this.queryParams.lostCredit = stauts;
-        this.init();
-      },
-      getHistoryData() {
-        this.queryParams.status = 1;
-        this.init();
-      },
-      colStyle(obj) {
-        if (obj.column.property == "id") {
-          return {
-            background: "#f8f8f9"
-          }
-        }
-      },
-      getObjId(object) {
-
-        this.form.objectId = object.id;
-
-        for(let i in this.areas){
-          if(this.areas[i].code == Number(object.areaCode)){
-            this.form.place = this.areas[i].name;
-            break;
-          }
-        }
-        for(let i in this.trashTypes){
-          if(this.trashTypes[i].code == Number(object.cargoId)){
-            this.form.type = this.trashTypes[i].name;
-            break;
-          }
-        }
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.isEdit = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          name: null,
-          type: null,
-          time: null,
-          place: null,
-          reason: null,
-          lostCredit: null,
-          objectId: null,
-        };
-        this.updateForm = {
-          reason:null,
-        };
-        this.resetForm("updateForm");
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        console.log(this.queryParams);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加工地";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCredit(id).then(response => {
-          this.form = response.data;
-          this.isEdit = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-              this.loading = true;
-            if (this.form.id != null) {
-              this.form.lostCredit = 0;
-              let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-
-              updateConstructionsites(data).then(response=>{
-                  this.updateForm.id = this.form.id;
-                  updateCredit(this.updateForm).then(response => {
-                    this.msgSuccess("撤销成功");
-                    this.isEdit = false;
-                    this.init();
-                  });
-                });
-            } else {
-              this.form.lostCredit = 1;
-              let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-              updateConstructionsites(data).then(response=>{
-                addCredit(this.form).then(response => {
-                  this.msgSuccess("新增成功");
-                  this.open = false;
-                  this.init();
-                });
-              });
-            }
-          }
-        });
-      },
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有工地数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCredit(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
+<script src="../../../api/construction_credit.js" />
 \ No newline at end of file
@@ -95,9 +95,9 @@
             v-model="form.name"
             filterable
             reserve-keyword
-            placeholder="驾驶员姓名">
+            placeholder="驾驶员姓名"
+            @change="getObjId">
             <el-option
-              @click.native="getObjId(item)"
               v-for="item in driverList"
               :key="item.id"
               :label="item.name"
@@ -150,256 +150,4 @@
   </div>
 </template>
-<script>
-import {
-  listCredit,
-  getCredit,
-  delCredit,
-  addCredit,
-  updateCredit,
-  exportCredit,
-  getNames,
-  historyCredit
-} from "@/api/business/driver";
-
-import {
-  companyList,
-  driverList
-} from "@/api/dict";
-
-import pagination from '../Pagination';
-export default {
-  name: "ConstructionCredit",
-    components: {pagination},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      infoDialog :false,
-      // 总条数
-      total: 0,
-      // 工地表格数据
-      creditList: [],
-      creditListInfo: [],
-      dictNames:[],
-      dictTypes:[],
-      dictPlaces:[],
-      driverList:[],
-      names:[],
-      idNumbers:[],
-      places:[],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      isEdit:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        idNumber: null,
-        time: null,
-        reason: null,
-        status: 0,
-        lostCredit: 1
-      },
-      // 表单参数
-      form: {},
-      updateForm:{},
-      // 表单校验
-      rules: {name: [
-          { required: true, message: '请选择驾驶员', trigger: 'change' },
-        ],reason: [
-          { required: true, message: '请填写原因', trigger: 'change' },
-        ]}
-    };
-  },
-  created() {
-    this.init();
-  },
-  methods: {
-    init(){
-      this.reset();
-
-        this.resetQuery();
-        this.getList();
-        this.getNamesData();
-
-      let query = {
-        'page':1,
-        'size':9999,
-        'creditStatus':0
-      }
-
-      companyList(query).then(response => {
-
-        let companys = response.result.list;
-
-        let ids = [];
-
-        for(let i = 0 ;i<companys.length;i++){
-          ids.push(companys[i].id);
-        }
-        query.companyIds = ids + "";
-        query.status = 3;
-
-        driverList(query).then(res=>{
-
-          this.driverList = res.result;
-
-        });
-
-      });
-    },
-    getDataInfo(row){
-      let param ={"objectId":row.objectId}
-      listCredit(param).then(response => {
-        this.creditListInfo = response.rows;
-        this.infoDialog = true;
-      });
-
-    },
-    getNamesData(){
-      getNames(this.queryParams).then(response => {
-        this.dictNames = response;
-      });
-    },
-    getData(stauts){
-      this.queryParams.status=0;
-      this.queryParams.lostCredit=stauts;
-      this.getList();
-    },
-    getHistoryData(){
-      this.queryParams.status=1;
-      this.init();
-    },
-    colStyle(obj){
-      if(obj.column.property == "id"){
-        return {background:"#f8f8f9"}
-      }
-    },
-    getObjId(a){
-      this.form.objectId = a.id;
-      this.form.idNumber = a.identityNo;
-    },
-    getList() {
-      this.loading = true;
-      if(this.queryParams.status==0){
-        listCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-      if(this.queryParams.status==1){
-        historyCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.isEdit = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        idNumber: null,
-        time: null,
-        reason: null,
-        lostCredit: null,
-        objectId: null,
-      };
-      this.updateForm = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      console.log(this.queryParams);
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加驾驶员";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCredit(id).then(response => {
-        this.form = response.data;
-        this.isEdit = true;
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if(this.open){
-        this.updateForm.reason = "1";
-      }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-
-            this.loading = true;
-          if (this.form.id != null) {
-            this.updateForm.id = this.form.id;
-            updateCredit(this.updateForm).then(response => {
-              this.msgSuccess("撤销成功");
-              this.isEdit = false;
-              this.init();
-            });
-          } else {
-            this.form.lostCredit = 1;
-            addCredit(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.init();
-            });
-          }
-        }
-      });
-    },
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有驾驶员数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return exportCredit(queryParams);
-      }).then(response => {
-        this.download(response.message);
-      })
-    }
-  }
-};
-</script>
+<script src="../../../api/driver_credit.js" />
@@ -172,265 +172,5 @@
   </div>
 </template>
-<script>
-import {
-  listCredit,
-  getCredit,
-  delCredit,
-  addCredit,
-  updateCredit,
-  exportCredit,
-  getNames,
-  getTypes,
-  getPlaces,
-  historyCredit
-} from "@/api/business/earthsites";
-import {
-  earthsitesList,
-  updateEarthsites
-} from "@/api/dict";
-
-import requestRemote from '@/utils/requestRemote'
-
-import pagination from '../Pagination';
-export default {
-  name: "EarthSitesCredit",
-    components: {pagination},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      infoDialog :false,
-      // 总条数
-      total: 0,
-      // 工地表格数据
-      creditList: [],
-      creditListInfo: [],
-      earthsitesList:[],
-      dictNames:[],
-      dictTypes:[],
-      dictPlaces:[],
-      names:[],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      isEdit:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        type: null,
-        time: null,
-        place: null,
-        reason: null,
-        status: 0,
-        lostCredit: 1
-      },
-      // 表单参数
-      form: {},
-      updateForm:{},
-      // 表单校验
-      rules: {name: [
-          { required: true, message: '请选择消纳场', trigger: 'change' },
-        ],reason: [
-          { required: true, message: '请填写原因', trigger: 'change' },
-        ]}
-    };
-  },
-  created() {
-    this.init();
-  },
-  methods: {
-    init(){
-        this.resetQuery();
-      this.reset();
-      this.getList();
-      this.getNamesData();
-      this.getTypesData();
-      this.getPlacesData();
-
-      let query = {
-        'page': 1,
-        'size': 9999,
-        'creditStatus': 0
-      };
-      earthsitesList(query).then(response => {
-        this.earthsitesList = response.result.list
-      });
-    },
-    getDataInfo(row){
-      let param ={"objectId":row.objectId}
-      listCredit(param).then(response => {
-        this.creditListInfo = response.rows;
-        this.infoDialog = true;
-      });
-
-    },
-    getNamesData(){
-      getNames(this.queryParams).then(response => {
-        this.dictNames = response;
-      });
-    },
-    getTypesData() {
-       getTypes(this.queryParams).then(response => {
-        this.dictTypes = response;
-      });
-    },
-    getPlacesData() {
-      getPlaces(this.queryParams).then(response => {
-        this.dictPlaces = response;
-      });
-    },
-    getData(stauts){
-      this.queryParams.status=0;
-      this.queryParams.lostCredit=stauts;
-      this.init();
-    },
-    getHistoryData(){
-      this.queryParams.status=1;
-      this.init();
-    },
-    colStyle(obj){
-      if(obj.column.property == "id"){
-        return {background:"#f8f8f9"}
-      }
-    },
-    getObjId(a){
-      this.form.objectId = a.id;
-      this.form.place = a.areaName;
-      this.form.type = a.typeName;
-    },
-    getList() {
-      this.loading = true;
-      if(this.queryParams.status==0){
-        listCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-      if(this.queryParams.status==1){
-        historyCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      }
-
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.isEdit = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        type: null,
-        time: null,
-        place: null,
-        reason: null,
-        lostCredit: null,
-        objectId: null,
-      };
-      this.updateForm = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      console.log(this.queryParams);
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加消纳场";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getCredit(id).then(response => {
-        this.form = response.data;
-        this.isEdit = true;
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-        if(this.open){
-          this.updateForm.reason = "1";
-        }
-
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-        this.loading = true;
-          if (this.form.id != null) {
-            this.form.lostCredit = 0;
-            let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-            updateEarthsites(data).then(res=>{
-              this.updateForm.id = this.form.id;
-              updateCredit(this.updateForm).then(response => {
-                this.msgSuccess("撤销成功");
-                this.isEdit = false;
-
-                this.init();
-              });
-            });
-          } else {
-            this.form.lostCredit = 1;
-            let data = [{creditStatus:this.form.lostCredit,objectId:this.form.objectId}];
-            updateEarthsites(data).then(res=>{
-              addCredit(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-
-                this.init();
-              });
-            });
-
-          }
-        }
-      });
-    },
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有消纳场数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return exportCredit(queryParams);
-      }).then(response => {
-        this.download(response.message);
-      })
-    }
-  }
-};
-</script>
+<script src="../../../api/earthsites_credit.js" />
 \ No newline at end of file
@@ -138,288 +138,4 @@
   </div>
 </template>
-<script>
-  import {
-    listCredit,
-    getCredit,
-    delCredit,
-    addCredit,
-    updateCredit,
-    exportCredit,
-    getNames,
-    getCompanys,
-    historyCredit
-  } from "@/api/business/truck";
-
-
-  import {
-    companyList,
-    truckList,
-    updateTruck
-  } from "@/api/dict";
-
-  export default {
-    name: "Credit",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        infoDialog: false,
-        // 总条数
-        total: 0,
-        // 工地表格数据
-        creditList: [],
-        creditListInfo: [],
-        dictNames: [],
-        dictCompanys: [],
-        companyList:[],
-        truckList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        isEdit: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          companyId: null,
-          licensePlate: null,
-          time: null,
-          reason: null,
-          status: 0,
-          lostCredit: 1
-        },
-        // 表单参数
-        form: {},
-        updateForm: {},
-        // 表单校验
-        rules: {
-          companyId: [{
-            required: true,
-            message: '请选择运输公司',
-            trigger: 'change'
-          }, ],
-          reason: [{
-            required: true,
-            message: '请填写原因',
-            trigger: 'change'
-          }, ],
-          licensePlate: [{
-            required: true,
-            message: '请选择车辆',
-            trigger: 'change'
-          }],
-        },
-        rules2: {
-          reason: [{
-            required: true,
-            message: '请填写原因',
-            trigger: 'change'
-          }, ],
-        }
-      };
-    },
-    created() {
-      this.init();
-    },
-    methods: {
-
-      init() {
-        this.resetQuery();
-        this.getList();
-        getNames(this.queryParams).then(response => {
-           this.dictNames = response;
-        });
-
-         getCompanys(this.queryParams).then(response => {
-           this.dictCompanys = response;
-        });
-
-          let query = {
-            'page':1,
-            'size':9999,
-            'dishonestState':0
-          }
-        companyList(query).then(response => {
-
-          let companys = response.result.list;
-          this.companyList = companys;
-          let ids = [];
-
-          for(let i = 0 ;i<companys.length;i++){
-            ids.push(companys[i].id);
-          }
-          query.companyID = ids + "";
-          query.valid = 0;
-
-          truckList(query).then(res=>{
-            this.truckList = res.result.list;
-          });
-
-        });
-
-
-      },
-      getDataInfo(row) {
-        console.log(row);
-
-        let param = {
-          "objectId": row.objectId
-        }
-
-        listCredit(param).then(response => {
-          this.creditListInfo = response.rows;
-          this.infoDialog = true;
-        });
-
-      },
-      getData(stauts) {
-        this.queryParams.status = 0;
-        this.queryParams.lostCredit = stauts;
-        this.init();
-      },
-      getHistoryData() {
-        this.queryParams.status = 1;
-        this.init();
-      },
-      colStyle(obj) {
-        if (obj.column.property == "id") {
-          return {
-            background: "#f8f8f9"
-          }
-        }
-      },
-      getObjId(a) {
-        this.form.companyId = a.companyName;
-        this.form.objectId = a.id;
-      },
-      getList() {
-        this.loading = true;
-        if (this.queryParams.status == 0) {
-          listCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-        if (this.queryParams.status == 1) {
-          historyCredit(this.queryParams).then(response => {
-            this.creditList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          });
-        }
-
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.isEdit = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          companyId: null,
-          licensePlate: null,
-          time: null,
-          reason: null,
-          status: null,
-          lostCredit: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        console.log(this.queryParams);
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "车辆失信录入";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCredit(id).then(response => {
-          this.form = response.data;
-          this.isEdit = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        if(this.isEdit){
-          this.$refs["updateForm"].validate(valid => {
-            if (valid) {
-                this.loading = true;
-                this.form.lostCredit = 0;
-                this.updateForm.id = this.form.id;
-              let data = [{creditStatus:this.form.lostCredit,id:this.form.objectId}];
-              updateTruck(data).then(res=>{
-                updateCredit(this.updateForm).then(response => {
-                  this.msgSuccess("撤销成功");
-                  this.isEdit = false;
-                  this.updateForm = {};
-                  this.init();
-                });
-                });
-            }
-          });
-        }else{
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-                this.loading = true;
-                this.form.lostCredit = 1;
-                this.form.createType = 0;
-                  let data = [{creditStatus:this.form.lostCredit,id:this.form.objectId}];
-                  updateTruck(data).then(res=>{
-                    addCredit(this.form).then(response => {
-                      this.msgSuccess("新增成功");
-                      this.open = false;
-                      this.init();
-                    });
-                  });
-            }
-          });
-        }
-      },
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有车辆数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCredit(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
+<script src="../../../api/truck_credit.js" />
 \ No newline at end of file
@@ -76,7 +76,7 @@
 </a>
-    <pagination
+    <h5page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -133,7 +133,7 @@
   <el-dialog title="查看详情" :visible.sync="open2" width="300px" append-to-body>
-    <caseOfflineInfo :businessKey="businessKey" v-if="open2" />
+    <h5Ingo :businessKey="businessKey" v-if="open2" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancel">取 消</el-button>
     </div>
@@ -153,346 +153,10 @@
   </div>
 </template>
-<script>
-import { listCaseOffline, getCaseOffline, delCaseOffline, addCaseOffline, updateCaseOffline, exportCaseOffline } from "@/api/caseOffline/caseOffline";
-import caseOfflineInfo from "@/views/h5/caseOffline/caseOfflineInfo";
+<script src="../../../api/caseoffline.js" />
-import {
-    getArea,
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-  } from "@/api/dict";
-import {
-    getThreestep,
-  } from "@/api/business/threestep";
-
-import {
-    getToken
-  } from "@/utils/auth";
-  
-  import pagination from '../Pagination';
-
-export default {
-  name: "CaseOffline",
-
-  components: {
-    caseOfflineInfo,
-    pagination
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 线下交办案卷表格数据
-      caseOfflineList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      open2:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        type: null,
-        place: null,
-        createTime: null,
-      },
-      uploadImageDialog:false,
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      caseType:[
-        {code:0,name:"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥"},
-        {code:1,name:"未洗车出场或者出场清洁不彻底"},
-        {code:2,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
-        {code:3,name:"非核准车辆进入渣土处置工地运输渣土"},
-        {code:4,name:"渣土处置工地未按规定时间开停工"},
-        {code:5,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
-        {code:6,name:"渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
-        {code:7,name:"其他1"},
-        {code:8,name:"其他2"},
-        {code:9,name:"其他3"}
-      ],
-      areas:null,
-      fileList:[],
-      areas: [],
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 设置上传的请求头部
-        headers: {
-          Authorization: "Bearer " + getToken()
-        },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
-      },
-      data:{},
-      objId:null
-    };
-  },
-  created() {
-
-
-
-    this.getList();
-
-      if(window.location.search){
-        let businessKey = window.location.search.split("=")[1];
-        let id;
-        if(businessKey.split(":").length == 2){
-            id = businessKey.split(":")[1];
-          }else{
-            id = businessKey;
-          }
-
-          getThreestep(id).then(response => {
-            let data = response.data;
-
-            this.handleAdd();
-
-            this.form.siteType = data.type + "";
-            this.form.siteName = data.name;
-            this.form.place = Number(data.place);
-          });
-      }
-
-
-
-    let remoteQueryData = {
-      "page": 1,
-      "size": 9999
-    }
-
-    constructionsitesList(remoteQueryData).then(res => {
-       this.data[0]= res.result.list;
-    });
-
-    earthsitesList(remoteQueryData).then(res => {
-        this.data[1]= res.result.list;
-    });
-  },
-  methods: {
-    getSite(item){
-      this.form.objectId = item.id;
-    },
-    /** 查询线下交办案卷列表 */
-    getList() {
-      this.loading = true;
-      listCaseOffline(this.queryParams).then(response => {
-        this.caseOfflineList = response.rows;
-
-        for(let i in this.caseOfflineList){
-          this.caseOfflineList[i].type = this.getCaseType(this.caseOfflineList[i].type);
-
-        }
-
-        getArea().then(res => {
-            this.areas = res.result;
-            for(let i =0;i< this.caseOfflineList.length;i++){
-              this.caseOfflineList[i].place = this.getAreaName(this.caseOfflineList[i].place);
-            }
-          });
-
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.open2 = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        type: null,
-        siteName: null,
-        locationDec: null,
-        caseDec: null,
-        status: 0,
-        place: null,
-        number: null,
-        siteType: null,
-        objectId: null,
-        createTime: null,
-        createBy: null,
-        advice1: null,
-        advice2: null,
-        advice3: null,
-        advice4: null,
-          attach:[]
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-   getAreaName(code){
-     for(let i =0;i<this.areas.length;i++){
-       if(Number(code) == this.areas[i].code){
-         return this.areas[i].name;
-         break;
-       }
-     }
-     return code;
-   },
-    getCaseType(type){
-      for(let i in this.caseType){
-
-
-        if(this.caseType[i].code==type)
-          return this.caseType[i].name
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加线下交办案卷";
-
-      let date = new Date();
-
-
-      this.form.number = date.getFullYear()
-                          +""+((date.getMonth()+1) < 10 ? "0" + (date.getMonth()+1) : (date.getMonth()+1))
-                          +""+ ((date.getDate()) < 10 ? "0" + (date.getDate()) : (date.getDate()))
-                          +""+ ((date.getHours()) < 10 ? "0" + (date.getHours()) : (date.getHours()))
-                          +""+ ((date.getMinutes()) < 10 ? "0" + (date.getMinutes()) : (date.getMinutes()))
-                          +""+ ((date.getSeconds()) < 10 ? "0" + (date.getSeconds()*1000) : (date.getSeconds()*1000))
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.businessKey =row.id + "";
-      this.open2 = true;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.form.attach  = this.form.attach +"";
-          if (this.form.id != null) {
-            updateCaseOffline(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCaseOffline(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除线下交办案卷编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCaseOffline(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有线下交办案卷数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCaseOffline(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-    },
-    removeAttchItem(index, img) {
-      this.form.attach.splice(this.form.attach.indexOf(img), 1);
-      this.$forceUpdate();
-    },
-    uploadSuccess(res, file, fileList) {
-		if(res.code){
-			this.$message(res.message);
-			return;
-		}
-      if(!this.form.attach){
-        this.form.attach = [];
-      }
-      this.form.attach.push(res);
-    },
-    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;
-      }
-      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 (!isAccept) {
-        this.$message.error('应该选择PDF、JPG、WORD类型的文件')
-        return isAccept;
-      }
-    },
-      downloadFile(path) {
-        window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-      },
-      handleClose() {
-        this.uploadImageDialog = false;
-        this.fileList = [];
-      },
-  }
-};
-</script>
 <style scope>
   .el-select-dropdown__item{
@@ -108,421 +108,11 @@
 </template>
 <script>
-  import {
-    dayWorkList,
-    exportDayWorkList
-  } from "@/api/business/daywork";
-
-
-  import {
-    Upload
-  } from "element-ui";
-  import {
-    getToken
-  } from "@/utils/auth";
-
-  import {
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-    getArea
-  } from "@/api/dict";
 import pagination from '../Pagination';
-  export default {
-    name: "dayWorkReport",
-    components: {pagination},
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-
-        reUpdate : false,
-
-        info: false,
-
-        infoData: null,
-        businessKey:null,
-        picSample: false,
-        uploadImageDialog: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 开工报表表格数据
-        threestepList: [],
-        fileList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10
-        },
-        // 表单参数
-        form: {
-        },
-        picIndex: null,
-        // 表单校验
-        rules: {
-        },
-        SiteWorkAreaCodeType: [],
-        remoteData: [{name:"a",id:"id"}],
-        remoteQueryData: {
-          "page": 1,
-          "size": 9999
-        },
-        areas: [{
-          code:"a",
-          name:"A"}
-        ],
-        constructionsitesList:[],
-        earthsitesList:[],
-        areaCode: null,
-        bindData: [{name:"a",id:"id"}],
-        bindname:null,
-        projectTypes:null,
-        earthsitesTypes:null,
-        dayWorkCount:null,
-        outside:["长沙县","望城区","浏阳市","宁乡市","株洲市","湘潭市","汩罗市","湘阴县"],
-      };
-    },
-    created() {
-      this.getList(0);
-      getDict({type:"CSConsSiteProjectType"}).then(res=>{
-        this.projectTypes = res.result;
-      });
-
-      getDict({type:"CSDisSiteType"}).then(res=>{
-        this.earthsitesTypes = res.result;
-      });
-    },
-    methods: {
-      areaClear() {
-        this.areaCode = null;
-      },
-      selectArea(a) {
-        this.areaCode = a;
-      },
-      getObjId(item) {
-        if (this.form.type == 0) {
-          this.form.objectId = item.id;
-          this.form.place = Number(item.areaCode);
-        } else {
-          this.form.earthsitesId = item.id;
-          this.form.place = Number(item.areaCode);
-        }
-      },
-      getEarthsiteId(item) {
-        if (this.form.type == 0) {
-          this.form.objectId = item.id;
-        } else {
-            this.form.earthsitesId = item.id;
-        }
-      },
-      handleClose() {
-        this.uploadImageDialog = false;
-        this.fileList = [];
-      },
-      /** 查询开工报表列表 */
-      getList(tabIdx) {
-
-        this.loading = true;
-
-        let query = this.queryParams;
-
-        if(this.queryParams.his != tabIdx && tabIdx == 1){
-          this.queryParams.his = tabIdx;
-          query.workStartTime = "2000-01-01 00:00:00";
-          query.workEndTime = "2999-01-01 00:00:00";
-        }else if(tabIdx==0){
-          this.queryParams.his = null;
-          query.workStartTime = null;
-          query.workEndTime = null;
-        }
-
-          dayWorkList(query).then(response => {
-
-            this.threestepList = response.rows;
-
-            getArea().then(res => {
-              this.areas = res.result;
-              for(let i =0;i< this.threestepList.length;i++){
-                this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
-                if(this.outside.indexOf(this.threestepList[i].place) > -1){
-                  if(this.threestepList[i].status == "开工"){
-                    this.threestepList[i].descript = "开工";
-                  }
-                }
-
-              }
-            });
-
-
-
-            constructionsitesList(this.remoteQueryData).then(res => {
-              this.constructionsitesList = res.result.list;
-
-              let count = 0;
-              let count1 = 0;
-
-              for(let i =0;i< this.threestepList.length;i++){
-
-                if(this.threestepList[i].status == "开工"){
-                  count += 1;
-                }
-                if(this.threestepList[i].estatus == "开工"){
-                  count1 += 1;
-                }
-                for(let j =0;j<this.constructionsitesList.length;j++){
-                  if(this.threestepList[i].objectId == this.constructionsitesList[j].id){
-                    for(let x in this.projectTypes){
-                      if(this.projectTypes[x].code == this.constructionsitesList[j].projectType){
-                        this.threestepList[i].type = this.projectTypes[x].name;
-                      }
-                    }
-                  }
-                }
-              }
-
-
-               let str = "今日";
-              if(this.queryParams.his){
-                str = "";
-              }
-
-                this.dayWorkCount = str + "长沙市工地开工数量:" + count + "  " + str  +"长沙市消纳场开工数量:" + count1;
-                this.loading = false;
-            });
-            earthsitesList(this.remoteQueryData).then(res => {
-              this.earthsitesList = res.result.list;
-              for(let i =0;i< this.threestepList.length;i++){
-                for(let j =0;j<this.earthsitesList.length;j++){
-                  if(this.threestepList[i].eid == this.earthsitesList[j].id){
-                        this.threestepList[i].etype = this.earthsitesList[j].typeName;
-                        this.threestepList[i].eplace = this.earthsitesList[j].areaName;
-                  }
-                }
-              }
-                this.loading = false;
-            });
-
-            this.total = response.total;
-          });
-
-
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          name: null,
-          type: null,
-          place: null,
-          selfCheckTime: null,
-          objectId: null,
-          earthsitesId: null,
-          createTime: null,
-          checkTime: null,
-          earthsitesName: null,
-          contract: null,
-          companys: null,
-          companyTrucks: null,
-          img0: null,
-          img1: null,
-          img2: null,
-          img3: null,
-          img4: null,
-          img5: null,
-          img6: null,
-          img7: null,
-          img8: null,
-          img9: null,
-          img10: null,
-          img11: null,
-          img12: null,
-          person: null,
-          phone: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "报工自查";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-          this.reset();
-          this.businessKey = row.id +"";
-          this.info = true;
-      },
-      getAreaName(code){
-        for(let i =0;i<this.areas.length;i++){
-          if(Number(code) == this.areas[i].code){
-            return this.areas[i].name;
-            break;
-          }
-        }
-        return code;
-      },
-
-      reSub(row){
-        this.reset();
-
-        this.open = true;
-        this.title = "再次提交";
-        getThreestep(row.id).then(res=>{
-            this.form = res.data;
-            this.form.type = this.form.type + "";
-
-            for (let i = 0; i < 13; i++) {
-              if (this.form["img" + i]) {
-                this.form["img" + i] = this.form["img" + i].split(",");
-              }
-            }
-
-
-            this.form.status = 0;
-            this.form.id = null;
-        });
-
-
-
-      },
-
-      checkEndSuccess(){
-        this.form.checkEndTime = new Date();
-        this.form.id = this.businessKey;
-        for (let i = 1; i < 4; i++) {
-          if (this.form["attchItem" + i]) {
-            this.form["attchItem" + i] = this.form["attchItem" + i] + "";
-          }
-        }
-        this.submitForm();
-      },
-      checkEndError(){
-        console.log(this.form, this.businessKey);
-        //发起案卷
-      },
-
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateThreestep(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.open2 = false;
-                this.getList();
-              });
-            } 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] + "";
-                }
-              }
-              addThreestep(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.open2 = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除开工报表编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delThreestep(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-
-        let data = [];
-        let index = 1;
-        for(let i in this.threestepList){
-
-
-          let obj = {
-            id:index,
-            name:this.threestepList[i].name,
-            createTime:this.threestepList[i].createTime,
-            selfCheckTime:this.threestepList[i].selfCheckTime,
-            type:this.threestepList[i].type,
-            place:this.threestepList[i].place,
-            status:this.threestepList[i].status,
-            ename:this.threestepList[i].ename,
-            etype:this.threestepList[i].etype,
-            eplace:this.threestepList[i].eplace,
-            estatus:this.threestepList[i].estatus,
-            eselfCheckTime:this.threestepList[i].eselfCheckTime,
-            descript:this.threestepList[i].descript,
-          }
-
-          data.push(obj);
-
-          index += 1;
+</script>
-        }
-        this.$confirm('是否确认导出所有开工报表数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportDayWorkList(data);
-        }).then(response => {
-          this.download(response.message);
-        })
-      }
-    }
-  };
-</script>
+<script src="../../../api/dayWorkReport.js" />
 \ No newline at end of file
@@ -120,7 +120,7 @@
     </a>
-    <pagination
+    <h5Page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -215,7 +215,7 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openInfo" width="300px" append-to-body :close-on-click-modal="false">
-      <leaveApplicationInfo :idInfo="idInfo" v-if="openInfo"/>
+      <h5Info :idInfo="idInfo" v-if="openInfo"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -223,318 +223,4 @@
   </div>
 </template>
-<script>
-import {
-  listLeaveApplication,
-  getLeaveApplication,
-  delLeaveApplication,
-  addLeaveApplication,
-  updateLeaveApplication,
-  exportLeaveApplication
-} from "@/api/office/leaveApplication";
-import Editor from '@/components/ZcEditor';
-import leaveApplicationInfo from './leaveApplicationInfo';
-import {getDict} from "@/api/dict";
-
-
-  import pagination from '../Pagination';
-
-export default {
-  name: "LeaveApplication",
-  components: {Editor, leaveApplicationInfo,pagination},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 请假申请表格数据
-      leaveApplicationList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        applicant: null,
-        deptName: null,
-        positionId: null,
-        birthdate: null,
-        phone: null,
-        type: null,
-        status: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        type: [
-          {required: true, message: '必填', trigger: 'change'},
-        ],
-        beginDate: [
-          {required: true, message: '必填', trigger: 'change'},
-        ],
-        endDate: [
-          {required: true, message: '必填', trigger: 'change'},
-        ],
-        phone: [
-          {required: true, message: '必填', trigger: 'change'},
-          {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
-            message: '手机号格式错误',
-            trigger: 'change'
-          }
-        ],
-        numberDays: [
-          {required: true, message: '必填', trigger: 'change'},
-          {
-            pattern: /^(0|[1-9]\d*)(\.5)?$/,
-            message: '只能为整数或者0.5',
-            trigger: 'change'
-          },
-          {
-            pattern: /^(?!0+(\.0+)?$)\d+(\.\d+)?$/,
-            message: '不能为0',
-            trigger: 'change'
-          }
-        ]
-      },
-      openInfo: false,
-      idInfo: null,
-      fileEntityList:[],
-      depts:[]
-    };
-  },
-  created() {
-    let dep =  {type:"CSUserDepartmentType"};
-    getDict(dep).then(res=>{
-      this.depts = res.result;
-    });
-    this.getList();
-  },
-  methods: {
-    /** 查询请假申请列表 */
-    getList() {
-      this.loading = true;
-      listLeaveApplication(this.queryParams).then(response => {
-        this.leaveApplicationList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openInfo = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.fileEntityList = [];
-      this.form = {
-        id: null,
-        applicant: null,
-        deptName: null,
-        positionId: null,
-        workDate: null,
-        birthdate: null,
-        phone: null,
-        type: null,
-        beginDate: null,
-        endDate: null,
-        numberDays: null,
-        content: null,
-        status: 0,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 查看按钮操作 */
-    handleInfo(row) {
-      this.reset();
-      this.idInfo = row.id+"";
-      this.title = "请假申请详情";
-      this.openInfo = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加请假申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getLeaveApplication(id).then(response => {
-        this.form = response.data.leaveApplication;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
-        this.open = true;
-        this.title = "修改请假申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let formData = new FormData();
-          let form = this.form;
-          //去掉params属性
-          delete form.params;
-          formData.append('fileList', null);
-          //将新增的文件放入formData
-          this.fileEntityList.forEach(item => {
-            if(item.id==null){
-              formData.append('fileList', item.raw)
-            }
-          })
-          if (this.form.id != null) {
-            formData.append("leaveApplication", JSON.stringify(form));
-            formData.append("uploadFilesList", null);
-            this.fileEntityList.forEach(item => {
-              delete item.params;
-              if(item != "null" && item != null){
-                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
-              }
-            })
-            updateLeaveApplication(formData).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            for (let key in form) {
-              formData.append(key, form[key] == null ? "" : form[key])
-            }
-            addLeaveApplication(formData).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除请假申请编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return delLeaveApplication(ids);
-      }).then(() => {
-        this.getList();
-        this.msgSuccess("删除成功");
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有请假申请数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return exportLeaveApplication(queryParams);
-      }).then(response => {
-        this.download(response.message);
-      })
-    },
-    /**
-     * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
-     * 大小不超过5M
-     * */
-    fileChange(file, fileList) {
-      let count = 0;
-      for (let i = 0; i < fileList.length; i++) {
-        // console.log(fileList.length)
-        // console.log(this.fileEntityList[i].name+"111"+file.name)
-        if (fileList[i].name == file.name) {
-          count++;
-          if (count == 2) {
-            this.$message({
-              message: '已存在此文件！',
-              type: 'warning'
-            });
-            for (let j = fileList.length; j > 0; j--) {
-              //如果存在此文件，去除新选择的重复文件
-              if (fileList[j - 1].name == file.name) {
-                fileList.splice(j - 1, 1);
-                i--;
-                return false;
-              }
-            }
-          }
-        }
-      }
-      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
-      //格式符合后判断大小
-      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
-        let max5M = file.size / 1024 / 1024 < 5;
-        if (!max5M) {
-          this.$message({
-            message: '上传文件大小不得超过5M！',
-            type: 'warning'
-          });
-          fileList = fileList.splice(fileList.length - 1, 1);
-        } else {
-          //符合条件后进行添加
-          this.fileEntityList = fileList
-        }
-      } else {
-        this.$message({
-          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
-          type: 'warning'
-        });
-      }
-    },
-    // 删除文件
-    handleDeleteFile(index) {
-      this.fileEntityList.splice(index, 1);
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-  }
-};
-</script>
+<script src="../../../api/leave.js">
@@ -886,7 +886,6 @@ export default {
           })
           return;
         } else {
-          if (value == 0) {
             let postData = {};
             postData.tableName = this.businessKey;
@@ -900,13 +899,6 @@ export default {
               });
             });
-          } else {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.violationCaseFile = false;
-              this.getList();
-            });
-          }
         }
       }
       if (this.definitionKey == "violation_warning") {
@@ -922,7 +914,7 @@ export default {
           })
           return;
         } else {
-          if (value == 0) {
+         
             let postData = {};
             postData.tableName = this.businessKey;
             postData.replyImg = this.form.replyImg;
@@ -935,13 +927,7 @@ export default {
               });
             });
-          } else {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.violationCaseFile1 = false;
-              this.getList();
-            });
-          }
+      
         }
       }
     },
@@ -11,39 +11,35 @@
       </el-col>
     </el-row>
-
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属企业" prop="company">
-        <el-input
-          v-model="queryParams.company"
-          placeholder="请输入所属企业"
-
-          size="small"
-
-        />
-      </el-form-item>
-      <el-form-item label="车牌号" prop="licensePlate">
-        <el-input
-          v-model="queryParams.licensePlate"
-          placeholder="请输入车牌号"
-
-          size="small"
-
-        />
-      </el-form-item>
-      <el-form-item label="激活时间" prop="activateTime">
-        <el-date-picker  size="small" style="width: 200px"
-          v-model="queryParams.activateTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择激活时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+   <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+     <el-form-item label="车牌号" prop="licensePlate">
+       <el-input
+         v-model="queryParams.licensePlate"
+         placeholder="请输入车牌号"
+         size="small" />
+     </el-form-item>
+     <el-form-item label="所属企业" prop="company">
+       <el-input v-model="queryParams.company" />
+     </el-form-item>
+     <el-form-item label="激活状态" prop="activateStatus">
+       <el-select v-model="queryParams.activateStatus" placeholder="请选择激活状态" size="small">
+         <el-option label="未激活" value="0"/>
+         <el-option label="已激活" value="1"/>
+       </el-select>
+     </el-form-item>
+     <el-form-item label="激活时间" prop="activateDate" v-if="openActivateTime">
+       <el-date-picker  size="small" style="width: 200px"
+         v-model="queryParams.activateDate"
+         type="date"
+         value-format="yyyy-MM-dd"
+         placeholder="选择激活时间">
+       </el-date-picker>
+     </el-form-item>
+     <el-form-item>
+       <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+       <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+     </el-form-item>
+   </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -93,7 +89,7 @@
      </el-row>
     </el-card>
-    <pagination
+    <h5Page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -105,23 +101,21 @@
     <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="请选择所属工地">
-            <el-option v-for="item in constList" @click.native="getCompany(item)" :label="item.name" :value="item.name" :key="item.id"></el-option>
+          <el-select v-model="form.construction" placeholder="请选择所属工地" @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>
-              <el-option v-for="item in constCompany" :label="item" :value="item"  @click.native="getTruckListByCompanyName(item)"/>
+            <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-form-item>
         <el-form-item label="车牌号" prop="licensePlate">
-            <el-select v-model="form.licensePlate" placeholder="请选择车辆">
-              <el-option  v-if="!construction.companyTrucks || construction.companyTrucks.indexOf(item.id) == -1"
-                        v-for="item in companyTruckList"
+            <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>
+              <el-option  v-if="!form.company || form.company == item.companyName"
+                        v-for="item in truckList"
                         :label="item.licenseplateNo"
-                        :value="item.licenseplateNo"
-                        :key="item.id"
-                        @click.native="getTruck(item)"/>
+                        :value="item.id"/>
             </el-select>
         </el-form-item>
       </el-form>
@@ -134,10 +128,4 @@
   </div>
 </template>
-<script>
-
-  import pagination from '../Pagination';
-
-</script>
-
 <script src="../../../api/truck_active.js" />
@@ -85,7 +85,7 @@
   </a>
-    <pagination
+    <h5Page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -220,7 +220,7 @@
       </div>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openInfo" width="300px" append-to-body :close-on-click-modal="false">
-      <violationCaseFileInfo :idInfo="idInfo" v-if="openInfo" :entryType="0"/>
+      <h5Info :idInfo="idInfo" v-if="openInfo" :entryType="0"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -228,452 +228,4 @@
   </div>
 </template>
-<script>
-import { listViolationCaseFile, getViolationCaseFile,
-        delViolationCaseFile, addViolationCaseFile,
-        updateViolationCaseFile, exportViolationCaseFile } from "@/api/casefile/violationCaseFile";
-import violationCaseFileInfo from "../task/violationCaseFileInfo";
-
-  import {
-    earthsitesList,
-    constructionsitesList,
-    getDict,
-    getArea,
-    companyList,
-    truckList,
-  } from "@/api/dict";
-
-
-  import pagination from '../Pagination';
-export default {
-  name: "ViolationCaseFile",
-  components: { violationCaseFileInfo,pagination },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 平台违规案卷表格数据
-      violationCaseFileList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        status: null,
-        receive: null,
-        receiveStatus: null,
-        readBy: null,
-        readTime: null
-      },
-      // 表单参数
-      form: {
-
-      },
-      place:null,
-      // 表单校验
-      rules: {
-        number :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationObjectType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        owningRegion :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-      },
-      caseType:[{code:0,name:"进入非专用车辆"},
-      {code:1,name:"无许可手续（工）"},
-      {code:2,name:"无许可手续（消）"},
-      {code:3,name:"黄土覆盖情况"},
-      {code:4,name:"出入口路面污染"},
-      {code:5,name:"出入口道路硬化"},
-      {code:6,name:"车辆冲洗是否到位"},
-      {code:7,name:"雾炮机是否正常开启"},
-      {code:8,name:"使用费专用车运输"},
-      {code:9,name:"监控点位未对准"},
-      {code:10,name:"未报开工作业"},
-      {code:11,name:"视频设备离线超时报警"},
-      {code:12,name:"三无车辆进入工地"},
-      {code:13,name:"未按时间作业"},
-      {code:14,name:"未报开工作业"},
-      {code:15,name:"视频设备离线超时报警"},
-      {code:16,name:"三无车辆进入消纳场"},
-      {code:17,name:"未到指定的消纳场作业"},
-      {code:18,name:"离线运输报警（工）"},
-      {code:19,name:"离线运输报警（消）"},
-      {code:20,name:"未激活车辆作业"},
-      {code:21,name:"未核准作业车辆作业"},
-      {code:22,name:"未按线路行驶"},
-      {code:23,name:"闯禁行驶"},
-      {code:24,name:"失信车辆作业"},
-      {code:25,name:"其他1"},
-      {code:26,name:"其他2"},
-      {code:27,name:"其他3"},
-      {code:28,name:"其他4"},
-      {code:29,name:"其他5"}],
-
-      projectNameList:[
-      ],
-      isLoading: false,
-      fileEntityList:[],
-      companyList:[
-      ],
-      remoteQueryData: {
-        "page": 1,
-        "size": 9999
-      },
-      areas:[],
-      data:{},
-      isLoadingCompany: false,
-      idInfo:null,
-      openInfo:false,
-    };
-  },
-  created() {
-    getArea().then(res=>{
-
-      this.areas = res.result;
-    });
-
-
-    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]);
-         }
-      });
-    });
-
-
-    companyList(this.remoteQueryData).then(res => {
-       this.companyList = res.result.list;
-    });
-
-
-
-    this.getList();
-  },
-  methods: {
-    selectArea(item){
-
-      this.form.owningRegion = item.name;
-      this.form.projectName = null;
-
-    },
-    /** 查询平台违规案卷列表 */
-    getList() {
-      this.loading = true;
-      listViolationCaseFile(this.queryParams).then(response => {
-        this.violationCaseFileList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openInfo = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.fileEntityList = [];
-      this.form = {
-        id: null,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        status: 0,
-        receive: null,
-        receiveStatus: 0,
-        readBy: null,
-        readTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    handleInfo(row){
-      this.idInfo = row.id + "";
-      this.openInfo = true;
-      this.title = "平台违规案卷详情";
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.form.number = this.getNumber();
-      this.form.violationGrade = "一般类";
-      this.form.sendObject = "区管理部门(治)";
-      this.title = "添加平台违规案卷";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getViolationCaseFile(id).then(response => {
-        this.form = response.data.violationCaseFile;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
-        this.open = true;
-        this.title = "修改平台违规案卷";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-
-          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
-
-            this.$message("请选择相关企业");
-
-            return;
-          }
-
-
-          let formData = new FormData();
-          let form = this.form;
-          //去掉params属性
-          delete form.params;
-          formData.append('fileList', null);
-          //将新增的文件放入formData
-          this.fileEntityList.forEach(item => {
-            if(item.id==null){
-              formData.append('fileList', item.raw)
-            }
-          })
-          if (this.form.id != null) {
-            formData.append("violationCaseFile", JSON.stringify(form));
-            formData.append("uploadFilesList", null);
-            this.fileEntityList.forEach(item => {
-              delete item.params;
-              if(item != "null" && item != null){
-                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
-              }
-            })
-            updateViolationCaseFile(formData).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            for (let key in form) {
-              formData.append(key, form[key] == null ? "" : form[key])
-            }
-            addViolationCaseFile(formData).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除平台违规案卷编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delViolationCaseFile(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有平台违规案卷数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportViolationCaseFile(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-    },
-    /** 生成案卷编号 */
-    getNumber(){
-      const now = new Date();
-      const year = now.getFullYear().toString().slice(-2); // 提取后两位数
-      const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-      const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-      const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-      const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-      const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-      const millisecond = now.getMilliseconds();
-      const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
-      return code;
-    },
-    projectNameLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoading = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'项目1' },
-          { name:'项目2' },
-          { name:'项目3' }
-        ].filter(item => item.name.includes(query))
-        this.projectNameList = data
-        this.isLoading = false
-      }, 200)
-    },
-    companyLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoadingCompany = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'公司1' },
-          { name:'公司2' },
-          { name:'公司3' }
-        ].filter(item => item.name.includes(query))
-        this.companyList = data
-        this.isLoadingCompany = false
-      }, 200)
-    },
-    /**
-     * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
-     * 大小不超过20M
-     * */
-    fileChange(file, fileList) {
-      let count = 0;
-      for (let i = 0; i < fileList.length; i++) {
-        // console.log(fileList.length)
-        // console.log(this.fileEntityList[i].name+"111"+file.name)
-        if (fileList[i].name == file.name) {
-          count++;
-          if (count == 2) {
-            this.$message({
-              message: '已存在此文件！',
-              type: 'warning'
-            });
-            for (let j = fileList.length; j > 0; j--) {
-              //如果存在此文件，去除新选择的重复文件
-              if (fileList[j - 1].name == file.name) {
-                fileList.splice(j - 1, 1);
-                i--;
-                return false;
-              }
-            }
-          }
-        }
-      }
-      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
-      //格式符合后判断大小
-      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
-        let max5M = file.size / 1024 / 1024 < 20;
-        if (!max5M) {
-          this.$message({
-            message: '上传文件大小不得超过20M！',
-            type: 'warning'
-          });
-          fileList = fileList.splice(fileList.length - 1, 1);
-        } else {
-          //符合条件后进行添加
-          this.fileEntityList = fileList
-        }
-      } else {
-        this.$message({
-          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
-          type: 'warning'
-        });
-      }
-    },
-    // 删除文件
-    handleDeleteFile(index) {
-      this.fileEntityList.splice(index, 1);
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    /** 生成违规描述 */
-    createDescribe(){
-      this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let formData = this.form;
-          const now = new Date();
-          const year = now.getFullYear();
-          const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-          const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-          const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-          const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-          const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-          const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
-          this.rules.companyName = null;
-          this.rules.projectName = null;
-        }
-      });
-
-    }
-  }
-};
-</script>
+<script src="../../../api/vio_casefile">
@@ -76,7 +76,7 @@
          </el-card>
     </a>
-    <pagination
+    <h5Page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -182,7 +182,7 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openInfo" width="300px" append-to-body :close-on-click-modal="false">
-      <violationWarningInformationInfo :idInfo="idInfo" v-if="openInfo" :entryType="0"/>
+      <h5Info :idInfo="idInfo" v-if="openInfo" :entryType="0"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -190,429 +190,4 @@
   </div>
 </template>
-<script>
-import { listViolationWarningInformation, getViolationWarningInformation, delViolationWarningInformation, addViolationWarningInformation, updateViolationWarningInformation, exportViolationWarningInformation } from "@/api/casefile/violationWarningInformation";
-import violationWarningInformationInfo from "../task/violationWarningInformationInfo";
-import {
-  earthsitesList,
-  constructionsitesList,
-  getDict,
-  getArea,
-  companyList,
-  truckList,
-} from "@/api/dict";
-
-  import pagination from '../Pagination';
-export default {
-  name: "ViolationWarningInformation",
-  components: { violationWarningInformationInfo ,pagination},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 违规预警信息表格数据
-      violationWarningInformationList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        receive: null,
-        receiveStatus: null,
-        readBy: null,
-        readTime: null,
-        replyOne: null,
-        replyTwo: null,
-        replyThree: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        number :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationObjectType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        owningRegion :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-        violationType :[
-          { required: true, message: "必填", trigger: "blur" }
-        ],
-      },
-      caseType:[{code:0,name:"工地预警-未报开工作业"},
-        {code:1,name:"工地预警-视频设备离线超时报警"},
-        {code:2,name:"工地预警-三无车辆进入工地"},
-        {code:3,name:"工地预警未按时间作业"},
-        {code:4,name:"消纳场预警-未报开工作业"},
-        {code:5,name:"消纳场预警-视频设备离线超时报警"},
-        {code:6,name:"消纳场预警-三无车辆进入消纳场"},
-        {code:7,name:"消纳场预警-未到指定的消纳场作业"},
-        {code:8,name:"离线运输报警(工)"},
-        {code:9,name:"离线运输报警(消)"},
-        {code:10,name:"未激活车辆作业"},
-        {code:11,name:"未核准作业车辆作业"},
-        {code:12,name:"未按线路行驶"},
-        {code:13,name:"闯禁行驶"},
-        {code:14,name:"失信车辆作业"}],
-      projectNameList:[
-      ],
-      isLoading: false,
-      fileEntityList:[],
-      companyList:[
-      ],
-      remoteQueryData: {
-        "page": 1,
-        "size": 9999
-      },
-      isLoadingCompany: false,
-      idInfo:null,
-      openInfo:false,
-      areas:[],
-      data:{},
-    };
-  },
-  created() {
-    getArea().then(res=>{
-
-      this.areas = res.result;
-    });
-
-
-    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]);
-        }
-      });
-    });
-
-    console.log(this.data);
-
-    companyList(this.remoteQueryData).then(res => {
-      this.companyList = res.result.list;
-    });
-    this.getList();
-  },
-  methods: {
-    selectArea(item){
-
-      this.form.owningRegion = item.name;
-      this.form.projectName = null;
-
-    },
-    /** 查询违规预警信息列表 */
-    getList() {
-      this.loading = true;
-      listViolationWarningInformation(this.queryParams).then(response => {
-        this.violationWarningInformationList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openInfo = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.fileEntityList = [];
-      this.form = {
-        id: null,
-        number: null,
-        violationObjectType: null,
-        owningRegion: null,
-        violationType: null,
-        violationGrade: null,
-        projectName: null,
-        companyName: null,
-        describe: null,
-        sendObject: null,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        receive: null,
-        receiveStatus: 0,
-        readBy: null,
-        readTime: null,
-        replyOne: null,
-        replyTwo: null,
-        replyThree: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    handleInfo(row){
-      this.idInfo = row.id+"";
-      this.openInfo = true;
-      this.title = "平台违规案卷详情";
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.form.number = this.getNumber();
-      this.form.violationGrade = "一般类";
-      this.form.sendObject = "区管理部门(治)";
-      this.title = "添加违规预警信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getViolationWarningInformation(id).then(response => {
-        this.form = response.data.violationWarningInformation;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
-        this.open = true;
-        this.title = "修改违规预警信息";
-      });
-
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
-
-            this.$message("请选择相关企业");
-
-            return;
-          }
-          let formData = new FormData();
-          let form = this.form;
-          //去掉params属性
-          delete form.params;
-          formData.append('fileList', null);
-          //将新增的文件放入formData
-          this.fileEntityList.forEach(item => {
-            if(item.id==null){
-              formData.append('fileList', item.raw)
-            }
-          })
-          if (this.form.id != null) {
-            formData.append("violationWarningInformation", JSON.stringify(form));
-            formData.append("uploadFilesList", null);
-            this.fileEntityList.forEach(item => {
-              delete item.params;
-              if(item != "null" && item != null){
-                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
-              }
-            })
-            updateViolationWarningInformation(formData).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            for (let key in form) {
-              formData.append(key, form[key] == null ? "" : form[key])
-            }
-            addViolationWarningInformation(formData).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除违规预警信息编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delViolationWarningInformation(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportViolationWarningInformation(queryParams);
-        }).then(response => {
-          this.download(response.message);
-        })
-    },
-    /** 生成案卷编号 */
-    getNumber(){
-      const now = new Date();
-      const year = now.getFullYear().toString().slice(-2); // 提取后两位数
-      const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-      const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-      const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-      const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-      const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-      const millisecond = now.getMilliseconds();
-      const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
-      return code;
-    },
-    projectNameLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoading = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'项目1' },
-          { name:'项目2' },
-          { name:'项目3' }
-        ].filter(item => item.name.includes(query))
-        this.projectNameList = data
-        this.isLoading = false
-      }, 200)
-    },
-    companyLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoadingCompany = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          { name:'公司1' },
-          { name:'公司2' },
-          { name:'公司3' }
-        ].filter(item => item.name.includes(query))
-        this.companyList = data
-        this.isLoadingCompany = false
-      }, 200)
-    },
-    /**
-     * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
-     * 大小不超过20M
-     * */
-    fileChange(file, fileList) {
-      let count = 0;
-      for (let i = 0; i < fileList.length; i++) {
-        // console.log(fileList.length)
-        // console.log(this.fileEntityList[i].name+"111"+file.name)
-        if (fileList[i].name == file.name) {
-          count++;
-          if (count == 2) {
-            this.$message({
-              message: '已存在此文件！',
-              type: 'warning'
-            });
-            for (let j = fileList.length; j > 0; j--) {
-              //如果存在此文件，去除新选择的重复文件
-              if (fileList[j - 1].name == file.name) {
-                fileList.splice(j - 1, 1);
-                i--;
-                return false;
-              }
-            }
-          }
-        }
-      }
-      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
-      //格式符合后判断大小
-      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
-        let max5M = file.size / 1024 / 1024 < 20;
-        if (!max5M) {
-          this.$message({
-            message: '上传文件大小不得超过20M！',
-            type: 'warning'
-          });
-          fileList = fileList.splice(fileList.length - 1, 1);
-        } else {
-          //符合条件后进行添加
-          this.fileEntityList = fileList
-        }
-      } else {
-        this.$message({
-          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
-          type: 'warning'
-        });
-      }
-    },
-    // 删除文件
-    handleDeleteFile(index) {
-      this.fileEntityList.splice(index, 1);
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    /** 生成违规描述 */
-    createDescribe(){
-      this.rules.companyName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.rules.projectName = [{ required: true, message: "必填", trigger: "blur" }]
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let formData = this.form;
-          const now = new Date();
-          const year = now.getFullYear();
-          const month = now.getMonth() + 1 < 10 ? `0${now.getMonth() + 1}` : now.getMonth() + 1;
-          const day = now.getDate() < 10 ? `0${now.getDate()}` : now.getDate();
-          const hour = now.getHours() < 10 ? `0${now.getHours()}` : now.getHours();
-          const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
-          const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
-          const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          this.form.describe =code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType;
-          this.rules.companyName = null;
-          this.rules.projectName = null;
-        }
-      });
-
-    }
-  }
-};
-</script>
+<script src="../../../api/warningInfo.js">
@@ -133,7 +133,7 @@
       </el-table-column>
     </el-table>
-    <pagination
+    <h5Page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -228,7 +228,7 @@
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openInfo" width="500px" append-to-body :close-on-click-modal="false">
-      <leaveApplicationInfo :idInfo="idInfo" v-if="openInfo"/>
+      <h5Info :idInfo="idInfo" v-if="openInfo"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -236,316 +236,4 @@
   </div>
 </template>
-<script>
-import {
-  listLeaveApplication,
-  getLeaveApplication,
-  delLeaveApplication,
-  addLeaveApplication,
-  updateLeaveApplication,
-  exportLeaveApplication
-} from "@/api/office/leaveApplication";
-import Editor from '@/components/ZcEditor';
-import leaveApplicationInfo from './leaveApplicationInfo';
-import {getDict} from "@/api/dict";
-
-export default {
-  name: "LeaveApplication",
-  components: {Editor, leaveApplicationInfo},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 请假申请表格数据
-      leaveApplicationList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        applicant: null,
-        deptName: null,
-        positionId: null,
-        birthdate: null,
-        phone: null,
-        type: null,
-        status: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        type: [
-          {required: true, message: '必填', trigger: 'change'},
-        ],
-        beginDate: [
-          {required: true, message: '必填', trigger: 'change'},
-        ],
-        endDate: [
-          {required: true, message: '必填', trigger: 'change'},
-        ],
-        phone: [
-          {required: true, message: '必填', trigger: 'change'},
-          {
-            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
-            message: '手机号格式错误',
-            trigger: 'change'
-          }
-        ],
-        numberDays: [
-          {required: true, message: '必填', trigger: 'change'},
-          {
-            pattern: /^(0|[1-9]\d*)(\.5)?$/,
-            message: '只能为整数或者0.5',
-            trigger: 'change'
-          },
-          {
-            pattern: /^(?!0+(\.0+)?$)\d+(\.\d+)?$/,
-            message: '不能为0',
-            trigger: 'change'
-          }
-        ]
-      },
-      openInfo: false,
-      idInfo: null,
-      fileEntityList:[],
-      depts:[]
-    };
-  },
-  created() {
-    let dep =  {type:"CSUserDepartmentType"};
-    getDict(dep).then(res=>{
-      this.depts = res.result;
-    });
-    this.getList();
-  },
-  methods: {
-    /** 查询请假申请列表 */
-    getList() {
-      this.loading = true;
-      listLeaveApplication(this.queryParams).then(response => {
-        this.leaveApplicationList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openInfo = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.fileEntityList = [];
-      this.form = {
-        id: null,
-        applicant: null,
-        deptName: null,
-        positionId: null,
-        workDate: null,
-        birthdate: null,
-        phone: null,
-        type: null,
-        beginDate: null,
-        endDate: null,
-        numberDays: null,
-        content: null,
-        status: 0,
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 查看按钮操作 */
-    handleInfo(row) {
-      this.reset();
-      this.idInfo = row.id+"";
-      this.title = "请假申请详情";
-      this.openInfo = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加请假申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getLeaveApplication(id).then(response => {
-        this.form = response.data.leaveApplication;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
-        this.open = true;
-        this.title = "修改请假申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let formData = new FormData();
-          let form = this.form;
-          //去掉params属性
-          delete form.params;
-          formData.append('fileList', null);
-          //将新增的文件放入formData
-          this.fileEntityList.forEach(item => {
-            if(item.id==null){
-              formData.append('fileList', item.raw)
-            }
-          })
-          if (this.form.id != null) {
-            formData.append("leaveApplication", JSON.stringify(form));
-            formData.append("uploadFilesList", null);
-            this.fileEntityList.forEach(item => {
-              delete item.params;
-              if(item != "null" && item != null){
-                formData.append('uploadFilesList', JSON.stringify(item).replaceAll("url", "filePath").replaceAll("name", "fileName"));
-              }
-            })
-            updateLeaveApplication(formData).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            for (let key in form) {
-              formData.append(key, form[key] == null ? "" : form[key])
-            }
-            addLeaveApplication(formData).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除请假申请编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return delLeaveApplication(ids);
-      }).then(() => {
-        this.getList();
-        this.msgSuccess("删除成功");
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有请假申请数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function () {
-        return exportLeaveApplication(queryParams);
-      }).then(response => {
-        this.download(response.message);
-      })
-    },
-    /**
-     * 文件改变时,限制文件上传格式和大小
-     * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
-     * 大小不超过5M
-     * */
-    fileChange(file, fileList) {
-      let count = 0;
-      for (let i = 0; i < fileList.length; i++) {
-        // console.log(fileList.length)
-        // console.log(this.fileEntityList[i].name+"111"+file.name)
-        if (fileList[i].name == file.name) {
-          count++;
-          if (count == 2) {
-            this.$message({
-              message: '已存在此文件！',
-              type: 'warning'
-            });
-            for (let j = fileList.length; j > 0; j--) {
-              //如果存在此文件，去除新选择的重复文件
-              if (fileList[j - 1].name == file.name) {
-                fileList.splice(j - 1, 1);
-                i--;
-                return false;
-              }
-            }
-          }
-        }
-      }
-      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
-      //格式符合后判断大小
-      if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
-        let max5M = file.size / 1024 / 1024 < 5;
-        if (!max5M) {
-          this.$message({
-            message: '上传文件大小不得超过5M！',
-            type: 'warning'
-          });
-          fileList = fileList.splice(fileList.length - 1, 1);
-        } else {
-          //符合条件后进行添加
-          this.fileEntityList = fileList
-        }
-      } else {
-        this.$message({
-          message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
-          type: 'warning'
-        });
-        fileList = fileList.splice(fileList.length - 1, 1);
-      }
-    },
-    // 删除文件
-    handleDeleteFile(index) {
-      this.fileEntityList.splice(index, 1);
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-  }
-};
-</script>
+<script src="../../../api/leave" >
@@ -68,7 +68,10 @@ public class SupervisionThreestepController extends BaseController
         List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
         return getDataTable(list);
     }
-
+    
+    
+    String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
+    
     /**
      * 查询三查机制列表
      */
@@ -90,6 +93,59 @@ public class SupervisionThreestepController extends BaseController
         List<Map<String,String>> list = supervisionThreestepService.selectDayWorkList(supervisionThreestep);
+        int count = 0;
+        int count1 = 0;
+        String place = "长沙市";
+        String place1 = "长沙市";
+        String string = "今日";
+        
+        if(supervisionThreestep.getSubReason()!=null){
+        	
+        	place1 = supervisionThreestep.getSubReason();
+        }
+        
+        if(supervisionThreestep.getHis().equals("1")){
+        	string = "";
+        }
+        
+        JSONArray areas = RemoteServerUtils.getAreas();
+        
+        for(Map<String, String> m:list){
+        	for(Object object:areas){
+        		JSONObject area = (JSONObject)object;
+        		
+        		if(supervisionThreestep.getPlace() != null){
+        			if(supervisionThreestep.getPlace().equals(area.get("code").toString())){
+        				place = area.get("name").toString();
+        			}
+        		}
+        		
+        		if( area.get("code").toString().equals( m.get("place"))){
+        			m.put("place", area.get("name").toString());
+        		}
+        		if( area.get("code").toString().equals( m.get("eplace"))){
+        			m.put("eplace", area.get("name").toString());
+        		}
+        	}
+        	
+        	for(String out:outside){
+        		if(out.equals(m.get("place"))){
+        			if(m.get("status").equals("开工")){
+        				m.put("estatus", "开工");
+        				m.put("eselfCheckTime", m.get("selfCheckTime"));
+        			}
+        			
+        		}
+        	}
+        	
+        	if(m.get("status").equals("开工")){
+        		count += 1;
+        	}
+        	if(m.get("estatus").equals("开工")){
+        		count1 += 1;
+        	}
+        }
+        
         TableDataInfo info = getDataTable(list);
         if(list.size() > (pageNum)*pageSize){
@@ -100,6 +156,7 @@ public class SupervisionThreestepController extends BaseController
         info.setRows(list);
+        info.setMsg(string + place+"工地开工数量" + count + "  "  + place1+"消纳场开工数量" + count1);
         return info;
     }
@@ -69,9 +69,13 @@ public class TruckActivateController extends BaseController
         		t.setIsAct("已激活");
         	}
         }
+        String title ="车辆激活";
+        if(truckActivate.getStatus() == 1){
+        	title = "车辆历史激活";
+        }
         ExcelUtil<TruckActivate> util = new ExcelUtil<TruckActivate>(TruckActivate.class);
-        return util.exportExcel(list, "车辆激活");
+        return util.exportExcel(list, title);
     }
     /**
@@ -261,7 +261,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 					continue;
 				}
-				if(s.getEarthsitesId().equals(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))){
+				if(s.getEarthsitesId().equals(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime())) 
+						&& e.getEarthsitesId().equals(s.getObjectId())){
 					if(s.getStatus() != 1 && e.getStatus() != 1){
 						continue;
@@ -305,8 +306,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				map.put("eid", s.getEarthsitesId());
 				map.put("ename", s.getEarthsitesName());
-				map.put("estatus", "消纳场未开工");
-				map.put("descript", "未开工");
+				map.put("estatus", "未开工");
+				map.put("descript", "消纳场未开工");
 				map.put("etype", "");
 			}
@@ -89,7 +89,6 @@ public class TruckActivateServiceImpl implements ITruckActivateService
         truckActivate.setCreateTime(DateUtils.getNowDate());
-    	truckActivate.setActivateTime(DateUtils.getNowDate());
     	TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(truckActivate.getObjectId());
@@ -73,7 +73,7 @@ public class CaseOfflineController extends BaseController
         }
         ExcelUtil<CaseOffline> util = new ExcelUtil<CaseOffline>(CaseOffline.class);
-        return util.exportExcel(list, "caseOffline");
+        return util.exportExcel(list, "线下交办案卷");
     }
     /**
@@ -21,6 +21,10 @@ public class CaseOffline extends BaseEntity
     @Excel(name = "序号")
     private Long id;
+    /** 案卷编号 */
+    @Excel(name = "案卷编号")
+    private String number;
+
     /** 案卷类型 */
     @Excel(name = "案卷类型",readConverterExp = "0=渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，"
     		+ "车轮带泥,1=未洗车出场或者出场清洁不彻底,2=渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场,"
@@ -46,10 +50,6 @@ public class CaseOffline extends BaseEntity
     @Excel(name = "所属区域")
     private String place;
-    /** 案卷编号 */
-    @Excel(name = "案卷编号")
-    private String number;
-
     /** 类型 */
     private Long siteType;
@@ -80,10 +80,22 @@ public class CaseOffline extends BaseEntity
     /** 审批意见 */
     private String attach;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
-    public Date getAdvice2Time() {
+    public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getAdvice2Time() {
 		return advice2Time;
 	}
@@ -60,7 +60,7 @@ public class ViolationCaseFile extends BaseEntity
     private Date createTime;
     /** 审批状态 */
-    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
+//    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
     private Integer status;
     /** 接收人 */
@@ -73,6 +73,7 @@ public class ViolationCaseFile extends BaseEntity
     private String readBy;
     /** 阅览时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date readTime;
     private String abbreviation;