youxiw2000 / trash · Commits

Commit 02fa310cef57dce201bee7fc89ab057d49fde15c

Authored by youxiw2000
1 parent 45674d7b
build: skipped

m

Inline Side-by-side
Showing 27 changed files with 312 additions and 87 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @02fa310
... ... @@ -16,10 +16,10 @@ trash:
16 16 # 验证码类型 math 数组计算 char 字符验证
17 17 captchaType: math
18 18 # 远程服务器地址
19   - remotePath: http://175.6.47.84:8008
20   - token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
21   - #remotePath: http://183.66.242.6:14601
22   - #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  19 + #remotePath: http://175.6.47.84:8008
  20 + #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
  21 + remotePath: http://183.66.242.6:14601
  22 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
23 23  
24 24  
25 25  
... ...
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @02fa310
... ... @@ -183,7 +183,6 @@ public class DriverTask
183 183 Map map = new HashMap<>();
184 184 map.put("size",9999);
185 185 map.put("dishonestState",0);
186   - map.put("creditState",0);
187 186 map.put("valid",0);
188 187 map.put("page",1);
189 188  
... ... @@ -194,6 +193,7 @@ public class DriverTask
194 193 if(trucks!=null){
195 194 for(Object jsonObject:trucks){
196 195 JSONObject truck = (JSONObject)jsonObject;
  196 +
197 197 try {
198 198 if(sdf.parse(truck.getString("transportCertValid")).getTime() < sdf.parse(sdf.format(new Date())).getTime() ||
199 199 sdf.parse(truck.getString("licenseValid")).getTime() < sdf.parse(sdf.format(new Date())).getTime()){
... ...
trash-ui/dist.rar
View file @02fa310
No preview for this file type
trash-ui/src/api/dict.js
  View file @02fa310
... ... @@ -8,6 +8,13 @@ export function getTruckList(params) {
8 8 });
9 9 }
10 10  
  11 +export function constructionLicenseById(id) {
  12 + return requestRemote({
  13 + url: '/api/siteservice/cs/constructionsites/license/'+id,
  14 + method: 'get',
  15 + });
  16 +}
  17 +
11 18  
12 19 export function constructionById(id) {
13 20 return requestRemote({
... ...
trash-ui/src/api/sitePaper.js
  View file @02fa310
... ... @@ -8,7 +8,7 @@ import store from &quot;@/store&quot;;
8 8  
9 9  
10 10 import {
11   - constructionById,
  11 + constructionLicenseById,
12 12 getArea
13 13 } from "@/api/dict";
14 14  
... ... @@ -130,7 +130,7 @@ import store from &quot;@/store&quot;;
130 130 id = this.businessKey;
131 131 }
132 132  
133   - constructionById(id).then(response => {
  133 + constructionLicenseById(id).then(response => {
134 134  
135 135 this.infoData = response.result;
136 136 getArea().then(res => {
... ...
trash-ui/src/api/taskmethod.js
  View file @02fa310
... ... @@ -44,6 +44,7 @@ export default {
44 44 this.$forceUpdate();
45 45 },
46 46 handleClose() {
  47 +
47 48 this.uploadImageDialog = false;
48 49 this.fileList = [];
49 50 this.slidesArys = [];
... ... @@ -155,6 +156,8 @@ export default {
155 156 this.vehicle = false;
156 157 this.videoSrc1 = [];
157 158 this.slides1 = [];
  159 + this.videos = [];
  160 + this.slides = [];
158 161 this.reset();
159 162 },
160 163 // 表单重置
... ... @@ -211,6 +214,10 @@ export default {
211 214 this.form.formData = formData;
212 215  
213 216 if (this.definitionKey == "workflow_threestep") {
  217 +
  218 + this.videos = [];
  219 + this.slides = [];
  220 +
214 221 this.open2 = true;
215 222 return;
216 223 }
... ...
trash-ui/src/api/truck_active.js
  View file @02fa310
... ... @@ -12,6 +12,9 @@ import {getDict} from &quot;@/api/dict&quot;;
12 12  
13 13 import h5Page from '@/views/h5/Pagination';
14 14  
  15 +
  16 +import truckActivateInfo from '@/views/business/truckActivate/truckActivateInfo';
  17 +
15 18 import {
16 19 todayDataList,
17 20 } from "@/api/business/threestep";
... ... @@ -29,6 +32,7 @@ export default {
29 32 name: "TruckActivate",
30 33 components: {
31 34 h5Page,
  35 + truckActivateInfo,
32 36 },
33 37 data() {
34 38 return {
... ... @@ -57,6 +61,7 @@ export default {
57 61 pageSize: 10,
58 62 company: null,
59 63 licensePlate: null,
  64 + construction:null,
60 65 time: null,
61 66 activateStatus:null,
62 67 construction: null,
... ... @@ -100,6 +105,8 @@ export default {
100 105 simpleName:null,
101 106 remoteCompanys:[],
102 107 truckName:null,
  108 + truckObj:null,
  109 + info:false,
103 110 };
104 111 },
105 112 created() {
... ... @@ -149,6 +156,10 @@ export default {
149 156  
150 157 },
151 158 methods: {
  159 + getInfo(row){
  160 + this.truckObj = row;
  161 + this.info = true;
  162 + },
152 163 selectAll(value){
153 164  
154 165 if(value){
... ... @@ -257,7 +268,8 @@ export default {
257 268 continue;
258 269  
259 270 let today = new Date().getTime();
260   - if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){
  271 +
  272 + if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < (today - (24*60*60*1000))){
261 273 continue;
262 274 }
263 275  
... ... @@ -373,11 +385,11 @@ export default {
373 385 }
374 386 }
375 387 }
376   -
  388 +
377 389 if(objs == ""){
378 390 this.form.licensePlate = null;
379 391 }
380   -
  392 +
381 393 this.$refs["form"].validate(valid => {
382 394 if (valid) {
383 395 let data = {
... ... @@ -391,7 +403,7 @@ export default {
391 403 }
392 404  
393 405 addTruckActivate(data).then(response => {
394   - this.msgSuccess("新增成功");
  406 + this.msgSuccess(response.message);
395 407 this.open = false;
396 408 this.getList();
397 409 });
... ...
trash-ui/src/layout/inde3x.vue renamed to trash-ui/src/layout/index3.vue
  View file @02fa310
trash-ui/src/views/activiti/task/sitePaper.vue
  View file @02fa310
... ... @@ -89,7 +89,7 @@
89 89 </el-row>
90 90 <el-row class="bd_bottom">
91 91 <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
92   - <el-col :span="18" class="bd_padding">{{infoData.routName}}</el-col>
  92 + <el-col :span="18" class="bd_padding">{{infoData.routeName}}</el-col>
93 93 </el-row>
94 94 <el-col :span="24" >
95 95 <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
... ...
trash-ui/src/views/business/truckActivate/index.vue
  View file @02fa310
... ... @@ -13,6 +13,12 @@
13 13  
14 14  
15 15 <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
  16 + <el-form-item label="工地名称" prop="construction">
  17 + <el-input
  18 + v-model="queryParams.construction"
  19 + placeholder="请输入工地名称"
  20 + size="small" />
  21 + </el-form-item>
16 22 <el-form-item label="车牌号" prop="licensePlate">
17 23 <el-input
18 24 v-model="queryParams.licensePlate"
... ... @@ -45,8 +51,7 @@
45 51 <el-row :gutter="10" class="mb8">
46 52 <el-col :span="1.5">
47 53 <el-button
48   - v-if="this.queryParams.status==0 && checkPer(['business.supervision.truckActivate.active'])
49   - && new Date().getHours() > 7 && new Date().getHours() < 24"
  54 + v-if="this.queryParams.status==0 && checkPer(['business.supervision.truckActivate.active'])"
50 55 type="primary"
51 56 size="mini"
52 57 @click="handleAdd"
... ... @@ -79,9 +84,17 @@
79 84 {{ scope.row.activateTime != null ? '已激活' : '未激活' }}
80 85 </template>
81 86 </el-table-column>
82   -
  87 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  88 + <template slot-scope="scope">
  89 + <el-button size="mini" type="text" icon="el-icon-edit" @click="getInfo(scope.row)">查看详情</el-button>
  90 + </template>
  91 + </el-table-column>
83 92 </el-table>
84 93  
  94 + <el-dialog title="车辆激活信息详情" width="800px" append-to-body :visible.sync="info">
  95 + <truckActivateInfo :truckObj="truckObj" v-if="info"/>
  96 + </el-dialog>
  97 +
85 98 <pagination
86 99 v-show="total>0"
87 100 :total="total"
... ... @@ -111,7 +124,7 @@
111 124 <el-input v-model="truckName" />
112 125 <el-checkbox-group v-model="form.licensePlate">
113 126 <el-checkbox @change="selectAll">全选</el-checkbox>
114   -
  127 +
115 128 <el-checkbox v-if="(!truckName || item.licenseplateNo.indexOf(truckName) > -1) && (form.company && form.company == item.companyName)"
116 129 :disabled="item.creditStatus != 0"
117 130 v-for="item in truckList"
... ...
trash-ui/src/views/business/truckActivate/truckActivateInfo.vue 0 → 100644
  View file @02fa310
  1 +<template>
  2 + <div v-loading="loading" >
  3 + <el-row >
  4 + <el-col :span="24" class="title">工地名称</el-col>
  5 + </el-row>
  6 + <el-row >
  7 + <el-col :span="24" class="content">{{truckObj.construction}}</el-col>
  8 + </el-row>
  9 + <el-row >
  10 + <el-col :span="24" class="title">施工地址</el-col>
  11 + </el-row>
  12 + <el-row >
  13 + <el-col :span="24" class="content">{{construction.address}}</el-col>
  14 + </el-row>
  15 + <el-row >
  16 + <el-col :span="24" class="title">运输车辆</el-col>
  17 + </el-row>
  18 + <el-row >
  19 + <el-col :span="24" class="content">{{truckObj.licensePlate}}</el-col>
  20 + </el-row>
  21 +
  22 + <el-row >
  23 + <el-col :span="24" class="title">运输公司</el-col>
  24 + </el-row>
  25 + <el-row >
  26 + <el-col :span="24" class="content">{{truckObj.company}}</el-col>
  27 + </el-row>
  28 +
  29 + <el-row >
  30 + <el-col :span="24" class="title">证照有效期起</el-col>
  31 + </el-row>
  32 + <el-row >
  33 + <el-col :span="24" class="content">{{construction.effectiveFrom}}</el-col>
  34 + </el-row>
  35 + <el-row >
  36 + <el-col :span="24" class="title" >证照有效期止</el-col>
  37 + </el-row>
  38 + <el-row >
  39 + <el-col :span="24" class="content">{{construction.effectiveEnd}}</el-col>
  40 + </el-row>
  41 +
  42 + <el-row >
  43 + <el-col :span="24" class="title">运输开始时间</el-col> </el-row>
  44 + <el-row >
  45 + <el-col :span="24" class="content">{{construction.transportStartTime}}</el-col> </el-row>
  46 + <el-row >
  47 + <el-col :span="24" class="title" >运输结束时间</el-col> </el-row>
  48 + <el-row >
  49 + <el-col :span="24" class="content">{{construction.transportEndTime}}</el-col>
  50 + </el-row>
  51 + <el-row >
  52 + <el-col :span="24" class="title">路线描述</el-col>
  53 + </el-row>
  54 + <el-row >
  55 + <el-col :span="24" class="content" >{{construction.routeName}}</el-col>
  56 + </el-row>
  57 + <el-row >
  58 + <el-col :span="24" class="title">卸区描述</el-col>
  59 + </el-row>
  60 + <el-row >
  61 + <el-col :span="24" class="content" >{{construction.earthName}}</el-col>
  62 + </el-row>
  63 +
  64 +
  65 + </div>
  66 +</template>
  67 +
  68 +
  69 +<script >
  70 +
  71 +import {
  72 + getArea,
  73 + truckList,
  74 + constructionLicenseById,
  75 + companyList,
  76 + } from "@/api/dict";
  77 +
  78 +
  79 + export default {
  80 + name: "truckActivateInfo",
  81 + props: {
  82 + truckObj: {
  83 + type: Object
  84 + }
  85 + },
  86 + data() {
  87 + return {
  88 + loading:false,
  89 + construction:null,
  90 + company:null,
  91 + }
  92 + },
  93 + created() {
  94 +
  95 + constructionLicenseById(this.truckObj.constructionId).then(res=>{
  96 + this.construction = res.result;
  97 + });
  98 +
  99 + let query = {
  100 + name:this.truckObj.company
  101 + };
  102 +
  103 + // companyList(query).then(res=>{
  104 + // this.company = res.result.list[0];
  105 + // });
  106 +
  107 + },
  108 +
  109 + };
  110 +
  111 +</script >
  112 +
  113 + <style scope>
  114 + .title{
  115 + font-size: 14px;
  116 + font-weight: bold;
  117 + padding: 5px;
  118 + }
  119 + .content{
  120 + color:gray;
  121 + font-size: 14px;
  122 + padding: 5px;
  123 + border-bottom: 3px solid #ccc;
  124 + }
  125 + </style>
... ...
trash-ui/src/views/h5/CompanyCredit/index.vue
  View file @02fa310
... ... @@ -52,7 +52,8 @@
52 52  
53 53 <el-row :gutter="10" class="mb8">
54 54 <el-col :span="1.5">
55   - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['Company:credit:add']" v-if="queryParams.status==0">新增</el-button>
  55 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['Company:credit:add']" v-if="queryParams.status==0&&
  56 + checkPer(['businessmanage.credit.CompanyCredit.add'])">新增</el-button>
56 57 </el-col>
57 58 <el-col :span="1.5">
58 59 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
... ... @@ -86,7 +87,8 @@
86 87 <span >失信原因:{{item.reason}}</span>
87 88 </el-col>
88 89 </el-row>
89   - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
  90 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0&&
  91 + checkPer(['businessmanage.credit.CompanyCredit.revoke'])">撤销失信</el-button>
90 92 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==1">查看</el-button>
91 93 </el-card>
92 94  
... ... @@ -163,4 +165,4 @@
163 165 width:300px;
164 166 }
165 167 </style>
166   -<script src="../../../api/company_credit.js" />
167 168 \ No newline at end of file
  169 +<script src="../../../api/company_credit.js" />
... ...
trash-ui/src/views/h5/ConstructionCredit/index.vue
  View file @02fa310
... ... @@ -56,7 +56,7 @@
56 56 <el-row :gutter="10" class="mb8">
57 57 <el-col :span="1.5">
58 58 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']"
59   - v-if="queryParams.status==0">新增</el-button>
  59 + v-if="queryParams.status==0 && checkPer(['businessmanage.credit.ConstructionCredit.add'])">新增</el-button>
60 60 </el-col>
61 61 <el-col :span="1.5">
62 62 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
... ... @@ -95,7 +95,9 @@
95 95 <span >失信原因:{{item.reason}}</span>
96 96 </el-col>
97 97 </el-row>
98   - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
  98 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']"
  99 + v-if="queryParams.status==0&&
  100 + checkPer(['businessmanage.credit.ConstructionCredit.revoke'])">撤销失信</el-button>
99 101 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==1">查看</el-button>
100 102 </el-card>
101 103  
... ... @@ -166,4 +168,4 @@
166 168 width:300px;
167 169 }
168 170 </style>
169   -<script src="../../../api/construction_credit.js" />
170 171 \ No newline at end of file
  172 +<script src="../../../api/construction_credit.js" />
... ...
trash-ui/src/views/h5/DriverCredit/index.vue
  View file @02fa310
... ... @@ -43,7 +43,8 @@
43 43  
44 44 <el-row :gutter="10" class="mb8">
45 45 <el-col :span="1.5">
46   - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']" v-if="queryParams.status==0">新增</el-button>
  46 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']" v-if="queryParams.status==0
  47 + && checkPer(['businessmanage.credit.DriverCredit.add'])">新增</el-button>
47 48 </el-col>
48 49 <el-col :span="1.5">
49 50 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
... ... @@ -77,7 +78,8 @@
77 78 <span >失信原因:{{item.reason}}</span>
78 79 </el-col>
79 80 </el-row>
80   - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
  81 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']"
  82 + v-if="queryParams.status==0&& checkPer(['businessmanage.credit.DriverCredit.revoke'])">撤销失信</el-button>
81 83 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==1">查看</el-button>
82 84 </el-card>
83 85  
... ...
trash-ui/src/views/h5/EarthSitesCredit/index.vue
  View file @02fa310
... ... @@ -54,7 +54,8 @@
54 54  
55 55 <el-row :gutter="10" class="mb8">
56 56 <el-col :span="1.5">
57   - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']" v-if="queryParams.status==0">新增</el-button>
  57 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']" v-if="queryParams.status==0&&
  58 + checkPer(['businessmanage.credit.EarthSitesCredi.add'])">新增</el-button>
58 59 </el-col>
59 60 <el-col :span="1.5">
60 61 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
... ... @@ -94,7 +95,8 @@
94 95 <span >失信原因:{{item.reason}}</span>
95 96 </el-col>
96 97 </el-row>
97   - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
  98 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0&&
  99 + checkPer(['businessmanage.credit.EarthSitesCredi.revoke'])">撤销失信</el-button>
98 100 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==1">查看</el-button>
99 101 </el-card>
100 102  
... ... @@ -173,4 +175,4 @@
173 175 }
174 176 </style>
175 177  
176   -<script src="../../../api/earthsites_credit.js" />
177 178 \ No newline at end of file
  179 +<script src="../../../api/earthsites_credit.js" />
... ...
trash-ui/src/views/h5/TruckCredit/index.vue
  View file @02fa310
... ... @@ -38,7 +38,8 @@
38 38 <el-row :gutter="10" class="mb8">
39 39 <el-col :span="1.5">
40 40 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['truck:credit:add']"
41   - v-if="queryParams.status==0">新增</el-button>
  41 + v-if="queryParams.status==0&&
  42 + checkPer(['businessmanage.credit.TruckCredit.add'])">新增</el-button>
42 43 </el-col>
43 44 <el-col :span="1.5">
44 45 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
... ... @@ -71,7 +72,8 @@
71 72 <span >失信原因:{{item.reason}}</span>
72 73 </el-col>
73 74 </el-row>
74   - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
  75 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0&&
  76 + checkPer(['businessmanage.credit.TruckCredit.revoke'])">撤销失信</el-button>
75 77 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(item)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==1">查看</el-button>
76 78 </el-card>
77 79  
... ... @@ -140,4 +142,4 @@
140 142 .el-select-dropdown__item{
141 143 width:300px;
142 144 }
143   -</style>
144 145 \ No newline at end of file
  146 +</style>
... ...
trash-ui/src/views/h5/task/index.vue
  View file @02fa310
1 1 <template>
2 2 <div class="app-container">
3   - <!-- <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
4   - <el-option v-for="item in depts" :label="item.name"
5   - :value="item.code" :key="item.code" >
6   - </el-option>
7   - </el-select>
8   - <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">
9   - <el-option v-for="item in roles" :label="item.name"
10   - :value="item.code" :key="item.code" >
11   - </el-option>
12   - </el-select> -->
  3 + <el-select v-model="queryParams.dept" filterable reserve-keyword >
  4 + <el-option v-for="item in depts" :label="item.name"
  5 + :value="item.code" :key="item.code">
  6 + </el-option>
  7 + </el-select>
  8 + <el-select v-model="queryParams.role" filterable reserve-keyword >
  9 + <el-option v-for="item in roles" :label="item.name"
  10 + :value="item.code" :key="item.code">
  11 + </el-option>
  12 + </el-select>
13 13 <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
14 14 <el-option v-for="item in names" :label="item" :value="item">
15 15 </el-option>
... ... @@ -834,7 +834,7 @@ export default {
834 834  
835 835  
836 836  
837   -<!--
  837 +<!--
838 838 remoteName(value){
839 839 getNames(value).then(res=>{
840 840  
... ... @@ -1596,4 +1596,4 @@ this.form.formData[0].controlValue = value;
1596 1596 },
1597 1597 handlePictureCardPreview(file) {
1598 1598 console.log(this.proofImage)
1599   - }, -->
1600 1599 \ No newline at end of file
  1600 + }, -->
... ...
trash-ui/src/views/h5/task/sitePaper.vue
  View file @02fa310
... ... @@ -86,7 +86,7 @@
86 86 </el-row>
87 87 <el-row >
88 88 <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
89   - <el-col :span="18" class="bd_padding">{{infoData.routName}}</el-col>
  89 + <el-col :span="18" class="bd_padding">{{infoData.routeName}}</el-col>
90 90 </el-row>
91 91 <el-col :span="24" >
92 92 <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
... ...
trash-ui/src/views/h5/threestep/index.vue
  View file @02fa310
... ... @@ -84,12 +84,6 @@
84 84 </el-select>
85 85 </el-form-item>
86 86  
87   - <el-form-item label="所属区域" prop="place" >
88   - <el-select v-model="form.place" placeholder="请选择所属区域" filterable reserve-keyword @clear="areaClear" @change="selectArea">
89   - <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code">
90   - </el-option>
91   - </el-select>
92   - </el-form-item>
93 87 <el-form-item :label="labelName" prop="name" v-if="form.type!=null">
94 88 <el-select v-model="form.name" filterable reserve-keyword @change="getObjId" :filter-method="getObjId">
95 89 <el-option v-for="item in remoteData" :label="item.name" :title="item.name"
... ... @@ -98,6 +92,12 @@
98 92 </el-select>
99 93 </el-form-item>
100 94  
  95 + <el-form-item label="所属区域" prop="place" >
  96 + <el-select v-model="form.place" placeholder="请选择所属区域" filterable reserve-keyword @clear="areaClear" @change="selectArea">
  97 + <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code">
  98 + </el-option>
  99 + </el-select>
  100 + </el-form-item>
101 101  
102 102 <!-- <el-form-item label="运输企业" prop="companys" v-if="form.type==0">
103 103 <el-select v-model="form.companys" filterable multiple @change="checkCompany" >
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @02fa310
... ... @@ -12,6 +12,12 @@
12 12 </el-row>
13 13  
14 14 <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
  15 + <el-form-item label="工地名称" prop="construction">
  16 + <el-input
  17 + v-model="queryParams.construction"
  18 + placeholder="请输入工地名称"
  19 + size="small" />
  20 + </el-form-item>
15 21 <el-form-item label="车牌号" prop="licensePlate">
16 22 <el-input
17 23 v-model="queryParams.licensePlate"
... ... @@ -49,7 +55,7 @@
49 55 size="mini"
50 56 @click="handleAdd"
51 57 v-hasPermi="['business:truckActivate:add']"
52   - >添加车辆并激活</el-button>
  58 + >手动激活</el-button>
53 59 </el-col>
54 60  
55 61 </el-row>
... ... @@ -75,14 +81,22 @@
75 81 </el-row>
76 82  
77 83 <el-row class="card_row" style="margin-top: 20px;">
78   - <el-col :span="24" class="card_grid" >
  84 + <el-col :span="18" class="card_grid" >
79 85 <span v-if="" style="margin-top:20px;">{{item.activateTime!=null ? '激活时间:' + item.activateTime : "未激活"}}</span>
80 86 </el-col>
  87 + <el-col :span="6" class="card_grid" >
  88 +
  89 + <el-button size="mini" type="text" icon="el-icon-edit" @click="getInfo(item)">查看详情</el-button>
  90 + </el-col>
81 91 </el-row>
82 92  
83 93  
84 94 </el-card>
85 95  
  96 + <el-dialog title="车辆激活信息详情" width="300px" append-to-body :visible.sync="info">
  97 + <truckActivateInfo :truckObj="truckObj" v-if="info"/>
  98 + </el-dialog>
  99 +
86 100 <h5Page
87 101 v-show="total>0"
88 102 :total="total"
... ...
trash-ui/vue.config.js
  View file @02fa310
... ... @@ -41,8 +41,8 @@ module.exports = {
41 41 }
42 42 },
43 43 ['/api']: {
44   - // target: `http://183.66.242.6:14601`,
45   - target: `http://175.6.47.84:8008`,
  44 + target: `http://183.66.242.6:14601`,
  45 + // target: `http://175.6.47.84:8008`,
46 46 changeOrigin: true,
47 47 },
48 48 ['^/remotedown']: {
... ...
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
  View file @02fa310
... ... @@ -184,7 +184,7 @@ public class TruckActivateController extends BaseController
184 184 @PostMapping
185 185 public AjaxResult add(@RequestBody TruckActivate truckActivate)
186 186 {
187   - return toAjax(truckActivateService.insertTruckActivate(truckActivate));
  187 + return truckActivateService.insertTruckActivate(truckActivate);
188 188 }
189 189  
190 190 @PostMapping(value="/getActivedTruckList")
... ...
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
  View file @02fa310
... ... @@ -69,9 +69,21 @@ public class TruckActivate extends BaseEntity
69 69  
70 70 private String[] cIds;
71 71  
  72 + private int createCount;
72 73  
73 74  
74   - public String getConstructionId() {
  75 +
  76 +
  77 +
  78 + public int getCreateCount() {
  79 + return createCount;
  80 + }
  81 +
  82 + public void setCreateCount(int createCount) {
  83 + this.createCount = createCount;
  84 + }
  85 +
  86 + public String getConstructionId() {
75 87 return constructionId;
76 88 }
77 89  
... ...
trash-workFlow/src/main/java/com/trash/business/service/ITruckActivateService.java
  View file @02fa310
... ... @@ -2,6 +2,7 @@ package com.trash.business.service;
2 2  
3 3 import java.util.List;
4 4 import com.trash.business.domain.TruckActivate;
  5 +import com.trash.common.core.domain.AjaxResult;
5 6  
6 7 /**
7 8 * 车辆激活Service接口
... ... @@ -33,7 +34,7 @@ public interface ITruckActivateService
33 34 * @param truckActivate 车辆激活
34 35 * @return 结果
35 36 */
36   - public int insertTruckActivate(TruckActivate truckActivate);
  37 + public AjaxResult insertTruckActivate(TruckActivate truckActivate);
37 38  
38 39 /**
39 40 * 修改车辆激活
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
  View file @02fa310
... ... @@ -73,7 +73,7 @@ public class DriverCreditServiceImpl implements IDriverCreditService
73 73 i = driverCreditMapper.insertDriverCredit(driverCredit);
74 74 }
75 75  
76   - sentDataToRemoteServer(driverCredit);
  76 +// sentDataToRemoteServer(driverCredit);
77 77  
78 78 return i;
79 79 }
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @02fa310
... ... @@ -8,6 +8,7 @@ import java.util.HashMap;
8 8 import java.util.List;
9 9 import java.util.Map;
10 10  
  11 +import com.trash.common.core.domain.AjaxResult;
11 12 import com.trash.common.core.redis.RedisCache;
12 13 import com.trash.common.utils.DateUtils;
13 14 import com.trash.common.utils.RemoteServerUtils;
... ... @@ -79,8 +80,14 @@ public class TruckActivateServiceImpl implements ITruckActivateService
79 80 * @return 结果
80 81 */
81 82 @Override
82   - public int insertTruckActivate(TruckActivate truckActivate)
  83 + public AjaxResult insertTruckActivate(TruckActivate truckActivate)
83 84 {
  85 +
  86 + AjaxResult ajaxResult = new AjaxResult();
  87 +
  88 + String errorMessage = "";
  89 + String successMessage = "";
  90 +
84 91 String start, end;
85 92  
86 93 SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
... ... @@ -119,8 +126,15 @@ public class TruckActivateServiceImpl implements ITruckActivateService
119 126  
120 127 TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(active.getObjectId());
121 128  
  129 +
  130 +
122 131 if(oldDate != null){
123 132  
  133 + if(oldDate.getCreateCount() > 1){
  134 + errorMessage += nos[i] + " ";
  135 + continue;
  136 + }
  137 +
124 138 SupervisionThreestep threestep = new SupervisionThreestep();
125 139  
126 140 threestep.setName(oldDate.getConstruction());
... ... @@ -137,28 +151,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService
137 151 threestep = threestepMapper.selectThreestepByTruckDate(threestep);
138 152  
139 153 if(threestep == null || threestep.getName().equals(truckActivate.getConstruction())){
140   - active.setId(oldDate.getId());
141   - truckActivateMapper.updateTruckActivate(active);
142   - }else{
143   - Long threeId = threestep.getId();
144   - String trucks = threestep.getCompanyTrucks();
145   -
146   - threestep = new SupervisionThreestep();
147   -
148   - threestep.setId(threeId);
149   -
150   - trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
151   -
152   - if(trucks.length() == 1){
153   - trucks = "";
154   - }
155   -
156   - threestep.setCompanyTrucks(trucks);
157   -
158   - //去除已有三查数据的车辆绑定
159   - threestepMapper.updateSupervisionThreestep(threestep);
160   - }
161   -
  154 +
162 155 //更新绑定的三查数据
163 156 threestep = new SupervisionThreestep();
164 157  
... ... @@ -188,16 +181,36 @@ public class TruckActivateServiceImpl implements ITruckActivateService
188 181  
189 182 threestepMapper.updateSupervisionThreestep(threestep);
190 183  
191   - active.setId(oldDate.getId());//更新已有车辆激活数据
  184 +
  185 + }else{
  186 + Long threeId = threestep.getId();
  187 + String trucks = threestep.getCompanyTrucks();
  188 +
  189 + threestep = new SupervisionThreestep();
  190 +
  191 + threestep.setId(threeId);
  192 +
  193 + trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
192 194  
  195 + if(trucks.length() == 1){
  196 + trucks = "";
  197 + }
  198 +
  199 + threestep.setCompanyTrucks(trucks);
  200 +
  201 + //去除已有三查数据的车辆绑定
  202 + threestepMapper.updateSupervisionThreestep(threestep);
  203 + }
  204 +
  205 + active.setId(oldDate.getId());//更新已有车辆激活数据
  206 + active.setCreateCount(oldDate.getCreateCount()+1);
  207 + successMessage += nos[i] + " ";
193 208 truckActivateMapper.updateTruckActivate(active);
194 209 continue;
195 210 }else{
196 211  
197 212 SupervisionThreestep threestep = new SupervisionThreestep();
198 213  
199   -// threestep.setName(truckActivate.getConstruction());
200   -// threestep.setCompanys(truckActivate.getCompany());
201 214 threestep.setObjectId(active.getConstructionId());
202 215  
203 216 try {
... ... @@ -221,14 +234,18 @@ public class TruckActivateServiceImpl implements ITruckActivateService
221 234 threestep.setCompanyTrucks(trucks);
222 235  
223 236 threestepMapper.updateSupervisionThreestep(threestep);
224   -
  237 +
  238 + active.setCreateCount(1);
  239 + successMessage += nos[i] + " ";
  240 +
225 241 truckActivateMapper.insertTruckActivate(active);
226 242 continue;
227 243 }
228 244 }
229 245  
  246 + String message = (successMessage.isEmpty() ? "" : successMessage + "激活成功! ") + (errorMessage.isEmpty() ? "" : errorMessage + "已激活2次!");
230 247  
231   - return objs.length;
  248 + return ajaxResult.success(message);
232 249  
233 250  
234 251 }
... ...
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @02fa310
... ... @@ -18,10 +18,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
18 18 <result property="createType" column="create_type" />
19 19 <result property="activateTime" column="activate_time" />
20 20 <result property="createTime" column="create_time" />
  21 + <result property="createCount" column="create_count" />
  22 +
  23 +
21 24 </resultMap>
22 25  
23 26 <sql id="selectTruckActivateVo">
24   - select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time from truck_activate
  27 + select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time,create_count from truck_activate
25 28 </sql>
26 29  
27 30 <select id="selectTruckActivateList" parameterType="TruckActivate" resultMap="TruckActivateResult">
... ... @@ -30,7 +33,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
30 33 <if test="company != null and company != ''"> and company like concat('%', #{company},'%')</if>
31 34 <if test="licensePlate != null and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if>
32 35 <if test="time != null "> and time = #{time}</if>
33   - <if test="construction != null and construction != ''"> and construction = #{construction}</if>
  36 + <if test="construction != null and construction != ''"> and construction like concat('%', #{construction},'%')</if>
34 37 <if test="constructionId != null and constructionId != ''"> and construction_id = #{constructionId}</if>
35 38 <if test="status != null "> and status = #{status}</if>
36 39 <if test="earthsite != null and earthsite != ''"> and earthsite = #{earthsite}</if>
... ... @@ -119,6 +122,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
119 122 <if test="createTime != null">create_time,</if>
120 123 <if test="createType != null">create_type,</if>
121 124 <if test="activateTime != null">activate_time,</if>
  125 + <if test="createCount != null">create_count,</if>
  126 +
122 127 </trim>
123 128 <trim prefix="values (" suffix=")" suffixOverrides=",">
124 129 <if test="company != null">#{company},</if>
... ... @@ -133,6 +138,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
133 138 <if test="createTime != null">#{createTime},</if>
134 139 <if test="createType != null">#{createType},</if>
135 140 <if test="activateTime != null">#{activateTime},</if>
  141 + <if test="createCount != null">#{createCount},</if>
136 142 </trim>
137 143 </insert>
138 144  
... ... @@ -151,6 +157,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
151 157 <if test="createType != null">create_type = #{createType},</if>
152 158 <if test="activateTime != null">activate_time = #{activateTime},</if>
153 159 <if test="createTime != null">create_time = #{createTime},</if>
  160 + <if test="createCount != null">create_count = #{createCount},</if>
154 161 </trim>
155 162 where id = #{id}
156 163 </update>
... ...