youxiw2000 / trash · Commits

Commit 0501e0e828034c07be3f7e1b3721b7b70813f0d1

Authored by youxiw2000
1 parent d2baeb02
build: skipped

m

Inline Side-by-side
Showing 22 changed files with 92 additions and 258 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @0501e0e
... ... @@ -160,11 +160,12 @@ public class DriverTask
160 160 driver.setReason("证件过期");
161 161 driver.setTime(new Date());
162 162 driver.setStatus(0L);
  163 + driver.setObjectId(json.getString("id"));
163 164  
164 165  
165 166 SpringUtils.getBean(IDriverCreditService.class).insertDriverCredit(driver);
166 167 }
167   - } catch (ParseException e) {
  168 + } catch (Exception e) {
168 169 // TODO Auto-generated catch block
169 170 e.printStackTrace();
170 171 }
... ...
trash-ui/src/api/caseoffline.js
  View file @0501e0e
... ... @@ -3,7 +3,7 @@ import { listCaseOffline, getCaseOffline, delCaseOffline, addCaseOffline, update
3 3  
4 4 import h5Info from "@/views/h5/caseOffline/caseOfflineInfo";
5 5  
6   -import h5page from '@/views/h5/Pagination';
  6 +import h5Page from '@/views/h5/Pagination';
7 7  
8 8  
9 9  
... ... @@ -27,7 +27,7 @@ export default {
27 27 components: {
28 28 caseOfflineInfo,
29 29 h5Info,
30   - h5page
  30 + h5Page
31 31 },
32 32 data() {
33 33 return {
... ... @@ -107,7 +107,6 @@ export default {
107 107  
108 108 if(window.location.search){
109 109 let businessKey = window.location.search.split("=")[1];
110   - debugger;
111 110 if(window.location.search.split("=")[0] == "?businessKey"){
112 111 let id;
113 112 if(businessKey.split(":").length == 2){
... ...
trash-ui/src/api/truck_active.js
  View file @0501e0e
... ... @@ -157,7 +157,7 @@ export default {
157 157 'valid': 0
158 158 }
159 159  
160   - query.companyID = item.transportCompanyId + "";
  160 + query.companyID = res.result.transportCompanyId+ "";
161 161 query.valid = 0;
162 162  
163 163 getConstructionTruck(item.objectId).then(res => {
... ...
trash-ui/src/layout/index6.vue renamed to trash-ui/src/layout/index3.vue
  View file @0501e0e
trash-ui/src/views/h5/CompanyCredit/index.vue
  View file @0501e0e
... ... @@ -55,9 +55,6 @@
55 55 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['Company:credit:add']" v-if="queryParams.status==0">新增</el-button>
56 56 </el-col>
57 57 <el-col :span="1.5">
58   - <el-button size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">导出</el-button>
59   - </el-col>
60   - <el-col :span="1.5">
61 58 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
62 59 </el-col>
63 60 <el-col :span="1.5">
... ... @@ -161,4 +158,9 @@
161 158 </div>
162 159 </template>
163 160  
  161 +<style scope>
  162 + .el-select-dropdown__item{
  163 + width:300px;
  164 + }
  165 +</style>
164 166 <script src="../../../api/company_credit.js" />
165 167 \ No newline at end of file
... ...
trash-ui/src/views/h5/ConstructionCredit/index.vue
  View file @0501e0e
... ... @@ -59,9 +59,6 @@
59 59 v-if="queryParams.status==0">新增</el-button>
60 60 </el-col>
61 61 <el-col :span="1.5">
62   - <el-button size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">导出</el-button>
63   - </el-col>
64   - <el-col :span="1.5">
65 62 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
66 63 </el-col>
67 64 <el-col :span="1.5">
... ... @@ -164,5 +161,9 @@
164 161 </div>
165 162 </template>
166 163  
167   -
  164 +<style scope>
  165 + .el-select-dropdown__item{
  166 + width:300px;
  167 + }
  168 +</style>
168 169 <script src="../../../api/construction_credit.js" />
169 170 \ No newline at end of file
... ...
trash-ui/src/views/h5/DriverCredit/index.vue
  View file @0501e0e
... ... @@ -46,9 +46,6 @@
46 46 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']" v-if="queryParams.status==0">新增</el-button>
47 47 </el-col>
48 48 <el-col :span="1.5">
49   - <el-button size="mini" @click="handleExport" v-hasPermi="['driver:credit:export']">导出</el-button>
50   - </el-col>
51   - <el-col :span="1.5">
52 49 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
53 50 </el-col>
54 51 <el-col :span="1.5">
... ... @@ -149,5 +146,9 @@
149 146 </el-dialog>
150 147 </div>
151 148 </template>
152   -
  149 +<style scope>
  150 + .el-select-dropdown__item{
  151 + width:300px;
  152 + }
  153 +</style>
153 154 <script src="../../../api/driver_credit.js" />
... ...
trash-ui/src/views/h5/EarthSitesCredit/index.vue
  View file @0501e0e
... ... @@ -57,10 +57,6 @@
57 57 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']" v-if="queryParams.status==0">新增</el-button>
58 58 </el-col>
59 59 <el-col :span="1.5">
60   - <el-button size="mini" @click="handleExport" v-hasPermi="['EarthSites:credit:export']">导出</el-button>
61   - </el-col>
62   -
63   - <el-col :span="1.5">
64 60 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
65 61 </el-col>
66 62 <el-col :span="1.5">
... ... @@ -171,6 +167,10 @@
171 167 </el-dialog>
172 168 </div>
173 169 </template>
174   -
  170 +<style scope>
  171 + .el-select-dropdown__item{
  172 + width:300px;
  173 + }
  174 +</style>
175 175  
176 176 <script src="../../../api/earthsites_credit.js" />
177 177 \ No newline at end of file
... ...
trash-ui/src/views/h5/TruckCredit/index.vue
  View file @0501e0e
... ... @@ -41,9 +41,6 @@
41 41 v-if="queryParams.status==0">新增</el-button>
42 42 </el-col>
43 43 <el-col :span="1.5">
44   - <el-button size="mini" @click="handleExport" v-hasPermi="['truck:credit:export']">导出</el-button>
45   - </el-col>
46   - <el-col :span="1.5">
47 44 <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
48 45 </el-col>
49 46 <el-col :span="1.5">
... ... @@ -138,4 +135,9 @@
138 135 </div>
139 136 </template>
140 137  
141   -<script src="../../../api/truck_credit.js" />
142 138 \ No newline at end of file
  139 +<script src="../../../api/truck_credit.js" />
  140 +<style scope>
  141 + .el-select-dropdown__item{
  142 + width:300px;
  143 + }
  144 +</style>
143 145 \ No newline at end of file
... ...
trash-ui/src/views/h5/caseOffline/caseOfflineInfo.vue
  View file @0501e0e
... ... @@ -50,164 +50,4 @@
50 50 </el-form>
51 51 </template>
52 52  
53   -<script>
54   -import { listCaseOffline, getCaseOffline,getAdviceList } from "@/api/caseOffline/caseOffline";
55   - import {
56   - getArea,
57   - earthsitesList,
58   - constructionsitesList,
59   - getDict,
60   -
61   - } from "@/api/dict";
62   - import {
63   - getThreestep,
64   - } from "@/api/business/threestep";
65   -
66   -
67   -
68   - import {
69   - getToken
70   - } from "@/utils/auth";
71   -export default {
72   - name: "CaseOffline",
73   - props: {
74   - businessKey: {
75   - type: String
76   - }
77   - },
78   - data() {
79   - return {
80   - // 遮罩层
81   - loading: true,
82   - // 选中数组
83   - ids: [],
84   - // 非单个禁用
85   - single: true,
86   - // 非多个禁用
87   - multiple: true,
88   - // 显示搜索条件
89   - showSearch: true,
90   - // 总条数
91   - total: 0,
92   - // 线下交办案卷表格数据
93   - caseOfflineList: [],
94   - // 弹出层标题
95   - title: "",
96   - // 是否显示弹出层
97   - open: false,
98   - open2:false,
99   - // 查询参数
100   - queryParams: {
101   - pageNum: 1,
102   - pageSize: 10,
103   - type: null,
104   - place: null,
105   - createTime: null,
106   - },
107   - uploadImageDialog:false,
108   - // 表单参数
109   - form: {},
110   - // 表单校验
111   - rules: {
112   - },
113   - caseType:[
114   - {code:1,name:"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥"},
115   - {code:2,name:"未洗车出场或者出场清洁不彻底"},
116   - {code:3,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
117   - {code:4,name:"非核准车辆进入渣土处置工地运输渣土"},
118   - {code:5,name:"渣土处置工地未按规定时间开停工"},
119   - {code:6,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
120   - {code:7,name:"渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"}
121   - ],
122   - areas:null,
123   - fileList:[],
124   - areas: [],
125   - upload: {
126   - // 是否显示弹出层（用户导入）
127   - open: false,
128   - // 弹出层标题（用户导入）
129   - title: "",
130   - // 是否禁用上传
131   - isUploading: false,
132   - // 设置上传的请求头部
133   - headers: {
134   - Authorization: "Bearer " + getToken()
135   - },
136   - // 上传的地址
137   - url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
138   -
139   - },
140   - workflow:"workflow_caseoffline",
141   - data:{},
142   - adviceList:[],
143   - };
144   - },
145   - created() {
146   - this.handleUpdate();
147   - },
148   - methods: {
149   - getSite(item){
150   - this.form.objectId = item.id;
151   - },
152   - getAreaName(code){
153   - for(let i =0;i<this.areas.length;i++){
154   - if(Number(code) == this.areas[i].code){
155   - return this.areas[i].name;
156   - break;
157   - }
158   - }
159   - return code;
160   - },
161   - getCaseType(type){
162   - for(let i in this.caseType){
163   -
164   -
165   - if(this.caseType[i].code==type)
166   - return this.caseType[i].name
167   - }
168   - },
169   - /** 修改按钮操作 */
170   - handleUpdate() {
171   - let id;
172   - if(this.businessKey.split(":").length == 2){
173   - id = this.businessKey.split(":")[1];
174   - }else{
175   - id = this.businessKey;
176   - }
177   -
178   - getCaseOffline(id).then(response => {
179   - this.form = response.data;
180   - if(this.form.attach && this.form.attach != "")
181   - this.form.attach = this.form.attach.split(",");
182   -
183   - this.form.siteType = this.form.siteType + "";
184   - this.form.type = this.getCaseType(this.form.type);
185   - this.form.place = this.getAreaName(this.form.place);
186   -
187   - getAdviceList(this.workflow+":"+id).then(res=>{
188   - if(res.data){
189   - if(res.data.advice1){
190   - this.adviceList.push({name: res.data.advice1.create_by ,time:res.data.advice1.create_time,text:this.form.advice1})
191   - }
192   - if(res.data.advice2){
193   - this.adviceList.push({name: res.data.advice2.create_by ,time:res.data.advice2.create_time,text:this.form.advice2})
194   - }
195   - if(res.data.advice3){
196   - this.adviceList.push({name: res.data.advice3.create_by ,time:res.data.advice3.create_time,text:this.form.advice3})
197   - }
198   - if(res.data.advice4){
199   - this.adviceList.push({name: res.data.advice4.create_by ,time:res.data.advice4.create_time,text:this.form.advice4})
200   - }
201   -
202   - }
203   - });
204   -
205   -
206   - this.open2 = true;
207   - });
208   -
209   -
210   - },
211   - }
212   -};
213   -</script>
  53 +<script src="../../../api/caseOfflineInfo" >
... ...
trash-ui/src/views/h5/caseOffline/index.vue
  View file @0501e0e
... ... @@ -35,15 +35,6 @@
35 35 v-hasPermi="['caseOffline:caseOffline:add']"
36 36 >新增</el-button>
37 37 </el-col>
38   - <el-col :span="1.5">
39   - <el-button
40   - type="warning"
41   - icon="el-icon-download"
42   - size="mini"
43   - @click="handleExport"
44   - v-hasPermi="['caseOffline:caseOffline:export']"
45   - >导出</el-button>
46   - </el-col>
47 38 </el-row>
48 39  
49 40 <a @click="handleUpdate(item)" v-for="item in caseOfflineList">
... ... @@ -76,7 +67,7 @@
76 67 </a>
77 68  
78 69  
79   - <h5page
  70 + <h5Page
80 71 v-show="total>0"
81 72 :total="total"
82 73 :page.sync="queryParams.pageNum"
... ... @@ -133,7 +124,7 @@
133 124  
134 125  
135 126 <el-dialog title="查看详情" :visible.sync="open2" width="300px" append-to-body>
136   - <h5Ingo :businessKey="businessKey" v-if="open2" />
  127 + <h5Info :businessKey="businessKey" v-if="open2" />
137 128 <div slot="footer" class="dialog-footer">
138 129 <el-button @click="cancel">取 消</el-button>
139 130 </div>
... ...
trash-ui/src/views/h5/dayWorkReport/index.vue
  View file @0501e0e
... ... @@ -53,9 +53,6 @@
53 53  
54 54  
55 55 <el-row :gutter="10" class="mb8">
56   - <el-col :span="1.5">
57   - <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
58   - </el-col>
59 56 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
60 57 </el-row>
61 58  
... ... @@ -101,18 +98,16 @@
101 98 </el-card>
102 99  
103 100  
104   - <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
  101 + <h5Page v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
105 102 @pagination="getList" />
106 103 </div>
107 104  
108 105 </template>
109 106  
110   -<script>
111   -
112   -import pagination from '../Pagination';
113   -
114   -
115   -</script>
116   -
  107 +<style scope>
  108 + .el-select-dropdown__item{
  109 + width:300px;
  110 + }
  111 +</style>
117 112  
118   -<script src="../../../api/dayWorkReport.js" />
119 113 \ No newline at end of file
  114 +<script src="../../../api/dayWorkReport.js" />
... ...
trash-ui/src/views/h5/leaveApplication/index.vue
  View file @0501e0e
... ... @@ -45,38 +45,6 @@
45 45 >新增
46 46 </el-button>
47 47 </el-col>
48   -<!-- <el-col :span="1.5">-->
49   -<!-- <el-button-->
50   -<!-- type="success"-->
51   -<!-- icon="el-icon-edit"-->
52   -<!-- size="mini"-->
53   -<!-- :disabled="single"-->
54   -<!-- @click="handleUpdate"-->
55   -<!-- v-hasPermi="['office:leaveApplication:edit']"-->
56   -<!-- >修改-->
57   -<!-- </el-button>-->
58   -<!-- </el-col>-->
59   -<!-- <el-col :span="1.5">-->
60   -<!-- <el-button-->
61   -<!-- type="danger"-->
62   -<!-- icon="el-icon-delete"-->
63   -<!-- size="mini"-->
64   -<!-- :disabled="multiple"-->
65   -<!-- @click="handleDelete"-->
66   -<!-- v-hasPermi="['office:leaveApplication:remove']"-->
67   -<!-- >删除-->
68   -<!-- </el-button>-->
69   -<!-- </el-col>-->
70   - <el-col :span="1.5">
71   - <el-button
72   - type="warning"
73   - icon="el-icon-download"
74   - size="mini"
75   - @click="handleExport"
76   - v-hasPermi="['office:leaveApplication:export']"
77   - >导出
78   - </el-button>
79   - </el-col>
80 48 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
81 49 </el-row>
82 50  
... ... @@ -224,3 +192,8 @@
224 192 </template>
225 193  
226 194 <script src="../../../api/leave.js">
  195 +<style scope>
  196 + .el-select-dropdown__item{
  197 + width:300px;
  198 + }
  199 +</style>
227 200 \ No newline at end of file
... ...
trash-ui/src/views/h5/task/index.vue
  View file @0501e0e
... ... @@ -1169,3 +1169,8 @@ export default {
1169 1169 <style>
1170 1170 @import '../../../assets/css/task.css'
1171 1171 </style>
  1172 +<style scope>
  1173 + .el-select-dropdown__item{
  1174 + width:300px;
  1175 + }
  1176 +</style>
1172 1177 \ No newline at end of file
... ...
trash-ui/src/views/h5/taskhistory/end.vue
  View file @0501e0e
... ... @@ -14,3 +14,8 @@ import history from &quot;@/views/h5/taskhistory/index&quot;;
14 14 }
15 15  
16 16 </script>
  17 +<style scope>
  18 + .el-select-dropdown__item{
  19 + width:300px;
  20 + }
  21 +</style>
17 22 \ No newline at end of file
... ...
trash-ui/src/views/h5/taskhistory/index.vue
  View file @0501e0e
... ... @@ -310,3 +310,8 @@
310 310 <style>
311 311 @import '../../../assets/css/task.css'
312 312 </style>
  313 +<style scope>
  314 + .el-select-dropdown__item{
  315 + width:300px;
  316 + }
  317 +</style>
313 318 \ No newline at end of file
... ...
trash-ui/src/views/h5/threestep/index.vue
  View file @0501e0e
... ... @@ -36,9 +36,6 @@
36 36 <el-col :span="1.5">
37 37 <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>
38 38 </el-col>
39   - <el-col :span="1.5">
40   - <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
41   - </el-col>
42 39 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
43 40 </el-row>
44 41  
... ... @@ -304,3 +301,8 @@ import pagination from &#39;../Pagination&#39;;
304 301 </script>
305 302  
306 303 <script src="../../../api/three_step.js" />
  304 +<style scope>
  305 + .el-select-dropdown__item{
  306 + width:300px;
  307 + }
  308 +</style>
307 309 \ No newline at end of file
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @0501e0e
... ... @@ -51,14 +51,7 @@
51 51 v-hasPermi="['business:truckActivate:add']"
52 52 >添加车辆并激活</el-button>
53 53 </el-col>
54   - <el-col :span="1.5">
55   - <el-button
56   - type="warning"
57   - size="mini"
58   - @click="handleExport"
59   - v-hasPermi="['business:truckActivate:export']"
60   - >导出</el-button>
61   - </el-col>
  54 +
62 55 </el-row>
63 56  
64 57 <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;">
... ... @@ -129,3 +122,8 @@
129 122 </template>
130 123  
131 124 <script src="../../../api/truck_active.js" />
  125 +<style scope>
  126 + .el-select-dropdown__item{
  127 + width:300px;
  128 + }
  129 +</style>
132 130 \ No newline at end of file
... ...
trash-ui/src/views/h5/violationCaseFile/index.vue
  View file @0501e0e
... ... @@ -229,3 +229,8 @@
229 229 </template>
230 230  
231 231 <script src="../../../api/vio_casefile">
  232 +<style scope>
  233 + .el-select-dropdown__item{
  234 + width:300px;
  235 + }
  236 +</style>
232 237 \ No newline at end of file
... ...
trash-ui/src/views/h5/violationWarningInformation/index.vue
  View file @0501e0e
... ... @@ -191,3 +191,8 @@
191 191 </template>
192 192  
193 193 <script src="../../../api/warningInfo.js">
  194 +<style scope>
  195 + .el-select-dropdown__item{
  196 + width:300px;
  197 + }
  198 +</style>
194 199 \ No newline at end of file
... ...
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
  View file @0501e0e
... ... @@ -84,11 +84,14 @@ public class CompanyCreditController extends BaseController
84 84  
85 85 List<String> withOut = new ArrayList<String>();
86 86  
  87 + String tag = "企业失信";
  88 +
87 89 if(companyCredit.getStatus() == 1){
88 90 withOut.add("time");
89   - companyCreditService.selectCompanyCreditHistory(companyCredit);
  91 + tag = "企业历史失信";
  92 + list = companyCreditService.selectCompanyCreditHistory(companyCredit);
90 93 }else{
91   - companyCreditService.selectCompanyCreditList(companyCredit);
  94 + list = companyCreditService.selectCompanyCreditList(companyCredit);
92 95 }
93 96  
94 97 for(int i = 0;i<list.size();i++){
... ... @@ -100,7 +103,7 @@ public class CompanyCreditController extends BaseController
100 103  
101 104  
102 105  
103   - return util.exportExcel(list, "企业失信",withOut);
  106 + return util.exportExcel(list, tag,withOut);
104 107 }
105 108  
106 109 /**
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @0501e0e
... ... @@ -653,12 +653,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
653 653 JSONObject truckInfo = RemoteServerUtils.getTruckInfo(truck,token);
654 654 if(truckInfo != null)
655 655 truckActivate.setCompany(truckInfo.getString("companyName"));
656   -
657   -
658   -
659 656 if(truckObject.getInteger("vehicleStatus") == 1){
660 657 truckActivate.setActivateTime(new Date());
661 658 }
  659 +
  660 +
  661 + System.out.println(truckObject.getString("licenseplateNo") + " " + truckObject.getInteger("vehicleStatus"));
  662 +
662 663  
663 664 if(taList.size() > 0){
664 665 truckActivate.setId(taList.get(0).getId());
... ...