m

youxiw2000
1 parent d2baeb02
Showing 22 changed files with 92 additions and 258 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/caseoffline.js
trash-ui/src/api/truck_active.js
trash-ui/src/layout/index6.vue → trash-ui/src/layout/index3.vue
trash-ui/src/views/h5/CompanyCredit/index.vue
trash-ui/src/views/h5/ConstructionCredit/index.vue
trash-ui/src/views/h5/DriverCredit/index.vue
trash-ui/src/views/h5/EarthSitesCredit/index.vue
trash-ui/src/views/h5/TruckCredit/index.vue
trash-ui/src/views/h5/caseOffline/caseOfflineInfo.vue
trash-ui/src/views/h5/caseOffline/index.vue
trash-ui/src/views/h5/dayWorkReport/index.vue
trash-ui/src/views/h5/leaveApplication/index.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/h5/taskhistory/end.vue
trash-ui/src/views/h5/taskhistory/index.vue
trash-ui/src/views/h5/threestep/index.vue
trash-ui/src/views/h5/truckActivate/index.vue
trash-ui/src/views/h5/violationCaseFile/index.vue
trash-ui/src/views/h5/violationWarningInformation/index.vue
@@ -160,11 +160,12 @@ public class DriverTask
 					driver.setReason("证件过期");
 					driver.setTime(new Date());
 					driver.setStatus(0L);
+					driver.setObjectId(json.getString("id"));
 					SpringUtils.getBean(IDriverCreditService.class).insertDriverCredit(driver);
 				}
-			} catch (ParseException e) {
+			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -3,7 +3,7 @@ import { listCaseOffline, getCaseOffline, delCaseOffline, addCaseOffline, update
 import h5Info from "@/views/h5/caseOffline/caseOfflineInfo";
-import h5page from '@/views/h5/Pagination';
+import h5Page from '@/views/h5/Pagination';
@@ -27,7 +27,7 @@ export default {
   components: {
     caseOfflineInfo,
     h5Info,
-    h5page
+    h5Page
   },
   data() {
     return {
@@ -107,7 +107,6 @@ export default {
       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){
@@ -157,7 +157,7 @@ export default {
             'valid': 0
           }
-          query.companyID = item.transportCompanyId + "";
+          query.companyID = res.result.transportCompanyId+ "";
           query.valid = 0;
           getConstructionTruck(item.objectId).then(res => {
@@ -55,9 +55,6 @@
         <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['Company:credit:add']"  v-if="queryParams.status==0">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button  size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-button type="primary"  size="mini" @click="handleQuery">查询</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -161,4 +158,9 @@
   </div>
 </template>
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 <script src="../../../api/company_credit.js" />
 \ No newline at end of file
@@ -59,9 +59,6 @@
           v-if="queryParams.status==0">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -164,5 +161,9 @@
   </div>
 </template>
-
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 <script src="../../../api/construction_credit.js" />
 \ No newline at end of file
@@ -46,9 +46,6 @@
         <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']"  v-if="queryParams.status==0">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button  size="mini" @click="handleExport" v-hasPermi="['driver:credit:export']">导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-button type="primary"  size="mini" @click="handleQuery">查询</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -149,5 +146,9 @@
     </el-dialog>
   </div>
 </template>
-
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 <script src="../../../api/driver_credit.js" />
@@ -57,10 +57,6 @@
         <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']"  v-if="queryParams.status==0">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button  size="mini" @click="handleExport" v-hasPermi="['EarthSites:credit:export']">导出</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
         <el-button type="primary"  size="mini" @click="handleQuery">查询</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -171,6 +167,10 @@
     </el-dialog>
   </div>
 </template>
-
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 <script src="../../../api/earthsites_credit.js" />
 \ No newline at end of file
@@ -41,9 +41,6 @@
           v-if="queryParams.status==0">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button size="mini" @click="handleExport" v-hasPermi="['truck:credit:export']">导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -138,4 +135,9 @@
   </div>
 </template>
-<script src="../../../api/truck_credit.js" />
 \ No newline at end of file
+<script src="../../../api/truck_credit.js" />
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -50,164 +50,4 @@
       </el-form>
 </template>
-<script>
-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: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>
+<script src="../../../api/caseOfflineInfo" >
@@ -35,15 +35,6 @@
           v-hasPermi="['caseOffline:caseOffline:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['caseOffline:caseOffline:export']"
-        >导出</el-button>
-      </el-col>
     </el-row>
     <a  @click="handleUpdate(item)" v-for="item in caseOfflineList">
@@ -76,7 +67,7 @@
 </a>
-    <h5page
+    <h5Page
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -133,7 +124,7 @@
   <el-dialog title="查看详情" :visible.sync="open2" width="300px" append-to-body>
-    <h5Ingo :businessKey="businessKey" v-if="open2" />
+    <h5Info :businessKey="businessKey" v-if="open2" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancel">取 消</el-button>
     </div>
@@ -53,9 +53,6 @@
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -101,18 +98,16 @@
      </el-card>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <h5Page v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
   </div>
 </template>
-<script>
-
-import pagination from '../Pagination';
-
-
-</script>
-
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
-<script src="../../../api/dayWorkReport.js" />
 \ No newline at end of file
+<script src="../../../api/dayWorkReport.js" />
@@ -45,38 +45,6 @@
         >新增
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['office:leaveApplication:edit']"-->
-<!--        >修改-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['office:leaveApplication:remove']"-->
-<!--        >删除-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['office:leaveApplication:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -224,3 +192,8 @@
 </template>
 <script src="../../../api/leave.js">
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -1169,3 +1169,8 @@ export default {
 <style>
   @import '../../../assets/css/task.css'
 </style>
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -14,3 +14,8 @@ import history from &quot;@/views/h5/taskhistory/index&quot;;
    }
 </script>
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -310,3 +310,8 @@
 <style>
   @import '../../../assets/css/task.css'
 </style>
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -36,9 +36,6 @@
       <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:threestep:add']" v-if="this.queryParams.pageStatus==0 && new Date().getHours() > 7 && new Date().getHours() < 24">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -304,3 +301,8 @@ import pagination from &#39;../Pagination&#39;;
 </script>
 <script src="../../../api/three_step.js" />
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -51,14 +51,7 @@
           v-hasPermi="['business:truckActivate:add']"
         >添加车辆并激活</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['business:truckActivate:export']"
-        >导出</el-button>
-      </el-col>
+
     </el-row>
    <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;">
@@ -129,3 +122,8 @@
 </template>
 <script src="../../../api/truck_active.js" />
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -229,3 +229,8 @@
 </template>
 <script src="../../../api/vio_casefile">
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -191,3 +191,8 @@
 </template>
 <script src="../../../api/warningInfo.js">
+<style scope>
+  .el-select-dropdown__item{
+    width:300px;
+  }
+</style>
 \ No newline at end of file
@@ -84,11 +84,14 @@ public class CompanyCreditController extends BaseController
         List<String> withOut = new ArrayList<String>();
+        String tag = "企业失信";
+        
         if(companyCredit.getStatus() == 1){
         	withOut.add("time");
-        	companyCreditService.selectCompanyCreditHistory(companyCredit);
+        	tag = "企业历史失信";
+        	list = companyCreditService.selectCompanyCreditHistory(companyCredit);
         }else{
-        	companyCreditService.selectCompanyCreditList(companyCredit);
+        	list = companyCreditService.selectCompanyCreditList(companyCredit);
         }
         for(int i = 0;i<list.size();i++){
@@ -100,7 +103,7 @@ public class CompanyCreditController extends BaseController
-        return util.exportExcel(list, "企业失信",withOut);
+        return util.exportExcel(list, tag,withOut);
     }
     /**
@@ -653,12 +653,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 						JSONObject truckInfo = RemoteServerUtils.getTruckInfo(truck,token);
 						if(truckInfo != null)
 							truckActivate.setCompany(truckInfo.getString("companyName"));
-						
-						
-						
 						if(truckObject.getInteger("vehicleStatus") == 1){
 							truckActivate.setActivateTime(new Date());
 						}
+
+						
+						System.out.println(truckObject.getString("licenseplateNo") + "  " + truckObject.getInteger("vehicleStatus"));
+						
 						if(taList.size() > 0){
 							truckActivate.setId(taList.get(0).getId());