youxiw2000 / trash · Commits

Commit 420016c1a6dec2bcd2fe1b99a587d3999380975f

Authored by 273548560@qq.com
2 parents a4a79e4a 19ee0fb4
build: skipped

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 16 changed files with 124 additions and 35 deletions
trash-ui/src/api/driver_credit.js
  View file @420016c
... ... @@ -83,7 +83,7 @@ export default {
83 83 this.getNamesData();
84 84  
85 85  
86   - let data = {};
  86 + let data = {valid:0};
87 87 driverList(data).then(res=>{
88 88  
89 89 this.driverList = res.list;
... ...
trash-ui/src/api/truck_credit.js
  View file @420016c
... ... @@ -10,6 +10,7 @@
10 10 historyCredit
11 11 } from "@/api/business/truck";
12 12  
  13 +import h5Page from '@/views/h5/Pagination';
13 14  
14 15 import {
15 16 companyList,
... ...
trash-ui/src/layout/inde3x.vue renamed to trash-ui/src/layout/index4.vue
  View file @420016c
trash-ui/src/views/activiti/task/bd.css 0 → 100644
  View file @420016c
  1 + .bd_padding{
  2 +
  3 + padding:5px;
  4 + }
  5 +
  6 + .bd_right {
  7 + border-right: 1px solid black;
  8 + height: 100%;
  9 + }
  10 +
  11 + .bd_left {
  12 + border-left: 1px solid black;
  13 + }
  14 +
  15 + .bd_top {
  16 + border-top: 1px solid black;
  17 + }
  18 +
  19 + .bd_bottom {
  20 + border-bottom: 1px solid black;
  21 + }
0 22 \ No newline at end of file
... ...
trash-ui/src/views/activiti/task/constructsiteInfo.vue
  View file @420016c
1 1 <template>
2 2 <div v-loading="loading">
3 3  
4   - <el-button @click="printBody">打印</el-button>
  4 + <el-button @click="printBody" :style="{'display':hide}">打印</el-button>
5 5 <div id="printItem">
6 6 <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
7 7 <el-col :span="1" class="bd_padding">
... ... @@ -156,7 +156,7 @@
156 156 <el-col :span="1" class="bd_padding bd_right">分管领导意见</el-col>
157 157 <el-col :span="23" >
158 158 <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
159   - <el-row >
  159 + <el-row class="bd_padding">
160 160 <label style="float: right;">签字:<img :src="signData.sign3" width="100px" height="40px" v-if="signData.sign3"/>{{signData.sign3Time}}</label>
161 161 </el-row>
162 162 </el-col>
... ... @@ -166,7 +166,7 @@
166 166 <el-col :span="1" class="bd_right bd_padding">渣土事务中心负责人意见</el-col>
167 167 <el-col :span="23" >
168 168 <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
169   - <el-row >
  169 + <el-row class="bd_padding">
170 170 <label style="float: right;">签字:<img :src="signData.sign4" width="100px" height="40px" v-if="signData.sign4"/>{{signData.sign4Time}}</label>
171 171 </el-row>
172 172 </el-col>
... ... @@ -201,6 +201,7 @@ import store from &quot;@/store&quot;;
201 201 },
202 202 data() {
203 203 return {
  204 + hide:'block',
204 205 sign: store.getters.avatar, //裁剪图片的地址
205 206 areas: [],
206 207 loading: null,
... ... @@ -290,8 +291,14 @@ import store from &quot;@/store&quot;;
290 291 },
291 292 methods: {
292 293 printBody(){
  294 +
  295 + let body = document.body;
  296 +
293 297 document.body.innerHTML = document.getElementById("printItem").innerHTML;
  298 +
294 299 window.print();
  300 +
  301 + window.location.reload();
295 302 },
296 303 getInfo() {
297 304 let id;
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @420016c
... ... @@ -751,7 +751,7 @@ export default {
751 751  
752 752 if (this.definitionKey == "workflow_constructsite") {
753 753 if (this.form.status == 1) {
754   - let objId = this.businessKey + "&";
  754 + let objId = this.businessKey.split(":")[1];
755 755 let query = {
756 756 objectId: objId,
757 757 };
... ...
trash-ui/src/views/caseOffline/caseOffline/index.vue
  View file @420016c
... ... @@ -7,7 +7,7 @@
7 7 </el-select>
8 8 </el-form-item>
9 9 <el-form-item label="所属区域" prop="place">
10   - <el-select v-model="queryParams.place" placeholder="请选择案卷类型" size="small">
  10 + <el-select v-model="queryParams.place" placeholder="请选择所属区域" size="small">
11 11 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
12 12 </el-select>
13 13 </el-form-item>
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @420016c
... ... @@ -3,7 +3,7 @@
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4 4  
5 5 <el-form-item label="所属区域" prop="owningRegion">
6   - <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" size="small">
  6 + <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" size="small">
7 7 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
8 8 </el-select>
9 9  
... ...
trash-ui/src/views/casefile/violationWarningInformation/index.vue
  View file @420016c
... ... @@ -9,7 +9,7 @@
9 9 </el-select>
10 10 </el-form-item>
11 11 <el-form-item label="所属区域" prop="owningRegion">
12   - <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
  12 + <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" clearable size="small">
13 13 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
14 14 </el-select>
15 15 </el-form-item>
... ...
trash-ui/src/views/h5/caseOffline/index.vue
  View file @420016c
... ... @@ -7,7 +7,7 @@
7 7 </el-select>
8 8 </el-form-item>
9 9 <el-form-item label="所属区域" prop="place">
10   - <el-select v-model="queryParams.place" placeholder="请选择案卷类型" size="small">
  10 + <el-select v-model="queryParams.place" placeholder="请选择所属区域" size="small">
11 11 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
12 12 </el-select>
13 13 </el-form-item>
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @420016c
... ... @@ -54,22 +54,15 @@
54 54  
55 55 </el-row>
56 56  
57   - <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;">
  57 + <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;padding: 10px;">
58 58  
59 59 <el-row class="card_row">
60   - <el-col :span="12" class="card_grid">
  60 + <el-col :span="24" class="card_grid">
61 61 <div class="card_title" style="font-weight: bold;">{{item.licensePlate}}</div>
62 62 </el-col>
63   - <el-col :span="12" class="card_grid" >
64   - <span v-if="item.activateTime!=null" style="float:right;margin-top:20px;">已激活</span>
65   - <el-button v-if="item.activateTime==null"
66   - style="float:right;"
67   - @click="handleUpdate(item)"
68   - >手动激活</el-button>
69   - </el-col>
70 63 </el-row>
71 64  
72   - <el-row class="card_row" style="margin-top: 5px;">
  65 + <el-row class="card_row" style="margin-top: 20px;">
73 66 <el-col :span="24">
74 67 <div>{{item.company}}</div>
75 68 </el-col>
... ... @@ -80,6 +73,14 @@
80 73 <div>{{item.construction}}</div>
81 74 </el-col>
82 75 </el-row>
  76 +
  77 + <el-row class="card_row" style="margin-top: 20px;">
  78 + <el-col :span="24" class="card_grid" >
  79 + <span v-if="" style="margin-top:20px;">{{item.activateTime!=null ? '激活时间:' + item.activateTime : "未激活"}}</span>
  80 + </el-col>
  81 + </el-row>
  82 +
  83 +
83 84 </el-card>
84 85  
85 86 <h5Page
... ... @@ -126,4 +127,4 @@
126 127 .el-select-dropdown__item{
127 128 width:300px;
128 129 }
129   -</style>
130 130 \ No newline at end of file
  131 +</style>
... ...
trash-ui/src/views/h5/violationCaseFile/index.vue
  View file @420016c
... ... @@ -3,7 +3,7 @@
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4  
5 5 <el-form-item label="所属区域" prop="owningRegion">
6   - <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" size="small">
  6 + <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" size="small">
7 7 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
8 8 </el-select>
9 9  
... ...
trash-ui/src/views/h5/violationWarningInformation/index.vue
  View file @420016c
... ... @@ -9,7 +9,7 @@
9 9 </el-select>
10 10 </el-form-item>
11 11 <el-form-item label="所属区域" prop="owningRegion">
12   - <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
  12 + <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域" clearable size="small">
13 13 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
14 14 </el-select>
15 15 </el-form-item>
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @420016c
... ... @@ -129,7 +129,7 @@ public class SupervisionThreestepController extends BaseController
129 129 }
130 130  
131 131 for(String out:outside){
132   - if(out.equals(m.get("place"))){
  132 + if(out.equals(m.get("eplace"))){
133 133 if(m.get("status").equals("开工")){
134 134 m.put("estatus", "开工");
135 135 m.put("eselfCheckTime", m.get("selfCheckTime"));
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionSignServiceImpl.java
  View file @420016c
... ... @@ -68,6 +68,10 @@ public class ConstructionSignServiceImpl implements IConstructionSignService
68 68  
69 69 String sign = SecurityUtils.getLoginUser().getUser().getAvatar();
70 70  
  71 + if(sign.contains("null")){
  72 + sign = null;
  73 + }
  74 +
71 75 if (constructionSign.getIdx() == 0) {
72 76 constructionSign.setSign1(sign);
73 77 constructionSign.setSign1Time(DateUtils.getNowDate());
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @420016c
... ... @@ -611,37 +611,92 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
611 611  
612 612 JSONObject area = (JSONObject)object;
613 613  
614   - if(outside[i].equals(area.getString("name"))){
615   - outside[i] = area.getString("code");
616   - }
617   -
  614 +// if(outside[i].equals(area.getString("name"))){
  615 +// outside[i] = area.getString("code");
  616 +// }
618 617 }
619   -
620 618 }
621 619  
622 620  
623 621  
624 622 if(supervisionThreestep.getStatus() == 1 && supervisionThreestep.getType() == 0){
  623 +
  624 + JSONObject earthList = RemoteServerUtils.getEarthSitesInfo( supervisionThreestep.getEarthsitesId());
  625 +
  626 + String eplace = null;
  627 +
  628 + if(earthList != null && earthList.size() > 0){
  629 + eplace = ((JSONObject)earthList).getString("areaName");
  630 + }
  631 +
  632 +
625 633 for(String out:outside){
626   - if(out.equals(supervisionThreestep.getPlace())){
627   -
628   -
  634 + if(out.equals(eplace)){
629 635 supervisionThreestep.setId(null);
  636 +
  637 + SupervisionThreestep sp = new SupervisionThreestep();
630 638 String name = supervisionThreestep.getName();
631 639 String objId = supervisionThreestep.getObjectId();
632 640 String eName = supervisionThreestep.getEarthsitesName();
633 641 String eId = supervisionThreestep.getEarthsitesId();
634   - supervisionThreestep.setCompanys(null);
635   - supervisionThreestep.setCompanyTrucks(null);
636   - supervisionThreestep.setType(1L);
  642 +
  643 + String start, end;
  644 +
  645 + Date date = new Date();
  646 +
  647 + if (new Date().getHours() < 8) {
  648 + end = yearFomat.format(date);
  649 + date.setDate(date.getDate() - 1);
  650 + start = yearFomat.format(date);
  651 + } else {
  652 + start = yearFomat.format(date);
  653 + date.setDate(date.getDate() + 1);
  654 + end = yearFomat.format(date);
  655 + }
  656 +
  657 + end += " 4:00:00";
  658 + start += " 8:00:00";
  659 +
  660 + try {
  661 + sp.setWorkStartTime(yearFomat.parse(start));
  662 + sp.setWorkEndTime(yearFomat.parse(end));
  663 + } catch (Exception e) {
  664 + // TODO Auto-generated catch block
  665 + e.printStackTrace();
  666 + }
  667 +
  668 + sp.setEarthsitesId(objId);
  669 + sp.setEarthsitesName(name);
  670 + sp.setName(eName);
  671 + sp.setObjectId(eId);
  672 + sp.setType(1L);
  673 +
  674 + SupervisionThreestep todayData = supervisionThreestepMapper.selectTodayData(sp);
  675 +
  676 + if(todayData != null){
  677 + return j;
  678 + }
637 679  
638 680 supervisionThreestep.setEarthsitesId(objId);
639 681 supervisionThreestep.setEarthsitesName(name);
640 682 supervisionThreestep.setName(eName);
641 683 supervisionThreestep.setObjectId(eId);
642   - supervisionThreestep.setCheckTime(new Date());
  684 +
  685 +
  686 + supervisionThreestep.setCompanys(null);
  687 + supervisionThreestep.setCompanyTrucks(null);
  688 + supervisionThreestep.setType(1L);
  689 + supervisionThreestep.setPlace(eplace);
  690 +
  691 +
  692 +
643 693  
644 694 supervisionThreestepMapper.insertSupervisionThreestep(supervisionThreestep);
  695 +
  696 + supervisionThreestep.setCheckTime(new Date());
  697 +
  698 + supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
  699 +
645 700  
646 701 return j;
647 702 }
... ...