Commit 47b8f1f2776023ad95932ba83ee9b0d080a8b4ae

Authored by youxiw2000
1 parent abc85632

m

trash-ui/dist.rar
No preview for this file type
trash-ui/src/api/company_credit.js
@@ -84,7 +84,6 @@ import h5Page from '@/views/h5/Pagination'; @@ -84,7 +84,6 @@ import h5Page from '@/views/h5/Pagination';
84 }, 84 },
85 methods: { 85 methods: {
86 init(){ 86 init(){
87 - this.resetQuery();  
88 this.getList(); 87 this.getList();
89 getNames(this.queryParams).then(response => { 88 getNames(this.queryParams).then(response => {
90 this.dictNames = response; 89 this.dictNames = response;
@@ -115,10 +114,12 @@ import h5Page from '@/views/h5/Pagination'; @@ -115,10 +114,12 @@ import h5Page from '@/views/h5/Pagination';
115 getData(stauts){ 114 getData(stauts){
116 this.queryParams.status=0; 115 this.queryParams.status=0;
117 this.queryParams.lostCredit=stauts; 116 this.queryParams.lostCredit=stauts;
  117 + this.resetQuery();
118 this.getList(); 118 this.getList();
119 }, 119 },
120 getHistoryData(){ 120 getHistoryData(){
121 this.queryParams.status=1; 121 this.queryParams.status=1;
  122 + this.resetQuery();
122 this.getList(); 123 this.getList();
123 }, 124 },
124 colStyle(obj){ 125 colStyle(obj){
trash-ui/src/api/construction_credit.js
@@ -104,7 +104,6 @@ import h5Page from '@/views/h5/Pagination'; @@ -104,7 +104,6 @@ import h5Page from '@/views/h5/Pagination';
104 methods: { 104 methods: {
105 init(){ 105 init(){
106 this.reset(); 106 this.reset();
107 - this.resetQuery();  
108 this.getList(); 107 this.getList();
109 this.getNamesData(); 108 this.getNamesData();
110 this.getTypesData(); 109 this.getTypesData();
@@ -163,10 +162,12 @@ import h5Page from '@/views/h5/Pagination'; @@ -163,10 +162,12 @@ import h5Page from '@/views/h5/Pagination';
163 getData(stauts) { 162 getData(stauts) {
164 this.queryParams.status = 0; 163 this.queryParams.status = 0;
165 this.queryParams.lostCredit = stauts; 164 this.queryParams.lostCredit = stauts;
  165 + this.resetQuery();
166 this.init(); 166 this.init();
167 }, 167 },
168 getHistoryData() { 168 getHistoryData() {
169 this.queryParams.status = 1; 169 this.queryParams.status = 1;
  170 + this.resetQuery();
170 this.init(); 171 this.init();
171 }, 172 },
172 colStyle(obj) { 173 colStyle(obj) {
trash-ui/src/api/dayWorkReport.js
@@ -137,9 +137,7 @@ export default { @@ -137,9 +137,7 @@ export default {
137 137
138 obj = { 138 obj = {
139 objectId:row.objectId, 139 objectId:row.objectId,
140 - name:row.name,  
141 selfCheckTime:row.selfCheckTime, 140 selfCheckTime:row.selfCheckTime,
142 - earthsitesId:row.eid,  
143 type:row.type 141 type:row.type
144 } 142 }
145 143
@@ -159,9 +157,7 @@ export default { @@ -159,9 +157,7 @@ export default {
159 } 157 }
160 obj = { 158 obj = {
161 objectId:row.objectId, 159 objectId:row.objectId,
162 - name:row.name,  
163 selfCheckTime:row.selfCheckTime, 160 selfCheckTime:row.selfCheckTime,
164 - earthsitesId:row.eid,  
165 type:0 161 type:0
166 } 162 }
167 163
@@ -171,9 +167,7 @@ export default { @@ -171,9 +167,7 @@ export default {
171 } 167 }
172 obj = { 168 obj = {
173 objectId:row.eid, 169 objectId:row.eid,
174 - name:row.ename,  
175 selfCheckTime:row.eselfCheckTime, 170 selfCheckTime:row.eselfCheckTime,
176 - earthsitesId:row.objectId,  
177 type:1 171 type:1
178 } 172 }
179 } 173 }
trash-ui/src/api/driver_credit.js
@@ -79,7 +79,6 @@ export default { @@ -79,7 +79,6 @@ export default {
79 init(){ 79 init(){
80 this.reset(); 80 this.reset();
81 81
82 - this.resetQuery();  
83 this.getList(); 82 this.getList();
84 this.getNamesData(); 83 this.getNamesData();
85 84
@@ -116,10 +115,12 @@ export default { @@ -116,10 +115,12 @@ export default {
116 getData(stauts){ 115 getData(stauts){
117 this.queryParams.status=0; 116 this.queryParams.status=0;
118 this.queryParams.lostCredit=stauts; 117 this.queryParams.lostCredit=stauts;
  118 + this.resetQuery();
119 this.getList(); 119 this.getList();
120 }, 120 },
121 getHistoryData(){ 121 getHistoryData(){
122 this.queryParams.status=1; 122 this.queryParams.status=1;
  123 + this.resetQuery();
123 this.init(); 124 this.init();
124 }, 125 },
125 colStyle(obj){ 126 colStyle(obj){
@@ -187,7 +188,6 @@ export default { @@ -187,7 +188,6 @@ export default {
187 /** 重置按钮操作 */ 188 /** 重置按钮操作 */
188 resetQuery() { 189 resetQuery() {
189 this.resetForm("queryForm"); 190 this.resetForm("queryForm");
190 - console.log(this.queryParams);  
191 this.handleQuery(); 191 this.handleQuery();
192 }, 192 },
193 // 多选框选中数据 193 // 多选框选中数据
trash-ui/src/api/earthsites_credit.js
@@ -80,7 +80,6 @@ export default { @@ -80,7 +80,6 @@ export default {
80 }, 80 },
81 methods: { 81 methods: {
82 init(){ 82 init(){
83 - this.resetQuery();  
84 this.reset(); 83 this.reset();
85 this.getList(); 84 this.getList();
86 this.getNamesData(); 85 this.getNamesData();
@@ -122,10 +121,12 @@ export default { @@ -122,10 +121,12 @@ export default {
122 getData(stauts){ 121 getData(stauts){
123 this.queryParams.status=0; 122 this.queryParams.status=0;
124 this.queryParams.lostCredit=stauts; 123 this.queryParams.lostCredit=stauts;
  124 + this.resetQuery();
125 this.init(); 125 this.init();
126 }, 126 },
127 getHistoryData(){ 127 getHistoryData(){
128 this.queryParams.status=1; 128 this.queryParams.status=1;
  129 + this.resetQuery();
129 this.init(); 130 this.init();
130 }, 131 },
131 colStyle(obj){ 132 colStyle(obj){
trash-ui/src/api/truck_active.js
@@ -8,6 +8,7 @@ import { @@ -8,6 +8,7 @@ import {
8 } from "@/api/business/truckActivate"; 8 } from "@/api/business/truckActivate";
9 9
10 10
  11 +import {getDict} from "@/api/dict";
11 12
12 import h5Page from '@/views/h5/Pagination'; 13 import h5Page from '@/views/h5/Pagination';
13 14
@@ -20,7 +21,8 @@ import { @@ -20,7 +21,8 @@ import {
20 getConstructionTruck, 21 getConstructionTruck,
21 constructionById, 22 constructionById,
22 truckList, 23 truckList,
23 - getTruckList 24 + getTruckList,
  25 + companyList
24 } from "@/api/dict"; 26 } from "@/api/dict";
25 27
26 export default { 28 export default {
@@ -101,12 +103,48 @@ export default { @@ -101,12 +103,48 @@ export default {
101 }, 103 },
102 created() { 104 created() {
103 105
  106 + let dep = {type: "CSUserDepartmentType"};
  107 +
  108 + getDict(dep).then(res => {
  109 + this.depts = res.result;
  110 + let need = true;
  111 + for(let i in res.result){
  112 + for(let j in this.$store.getters.roleIds){
  113 + if(this.$store.getters.roleIds[j] == res.result[i].code && (res.result[i].name.indexOf("渣土办") > -1 || res.result[i].name.indexOf("事务中心") > -1)){
  114 + need = false;
  115 + break;
  116 + }
  117 + }
  118 + if(!need){
  119 + break;
  120 + }
  121 + }
  122 + if(need){
  123 + let query = {
  124 + name:this.$store.getters.name.replace("公司", "")
  125 + }
  126 +
  127 +
  128 + companyList(query).then(res=>{
  129 +
  130 + for(let i in res.result.list){
  131 + if(res.result.list[i].abbreviation == this.$store.getters.name.replace("公司", "")){
  132 + this.simpleName = res.result.list[i].name;
  133 + break;
  134 + }
  135 + }
  136 +
  137 + this.getList(0);
  138 + });
  139 +
  140 + }else{
  141 +
  142 + this.getList(0);
  143 + }
  144 + });
  145 +
104 146
105 - // if(this.$store.getters.name.indexOf("渣土") == -1){  
106 - // this.simpleName = this.$store.getters.name;  
107 - // }  
108 147
109 - this.getList(0);  
110 }, 148 },
111 methods: { 149 methods: {
112 /** 查询车辆激活列表 */ 150 /** 查询车辆激活列表 */
@@ -160,7 +198,7 @@ export default { @@ -160,7 +198,7 @@ export default {
160 let param = { 198 let param = {
161 companyId:res.result.transportCompanyId, 199 companyId:res.result.transportCompanyId,
162 auditStatus:1, 200 auditStatus:1,
163 - dishonestState:0 201 + valid:0
164 } 202 }
165 203
166 204
@@ -171,18 +209,27 @@ export default { @@ -171,18 +209,27 @@ export default {
171 if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){ 209 if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){
172 continue; 210 continue;
173 } 211 }
174 - param.companyId += "," + unit.companyId; 212 + if(unit.companyName){
  213 + param.companyId += "," + unit.companyId;
175 214
176 - this.companyList.push({  
177 - id: unit.companyId,  
178 - name: unit.companyName  
179 - }); 215 + this.companyList.push({
  216 + id: unit.companyId,
  217 + name: unit.companyName
  218 + });
  219 + }
180 220
181 } 221 }
182 222
183 - getTruckList(param).then(tres=>{  
184 - for(let i = 0;i< tres.result.length;i++){;  
185 - this.truckList.push({licenseplateNo:tres.result[i].licenseplateNo,id:tres.result[i].id,companyName:tres.result[i].companyName}); 223 + truckList(param).then(tres=>{
  224 + let list = tres.result.list;
  225 + for(let i = 0;i< list.length;i++){;
  226 + let credit = "";
  227 + if(list[i].creditStatus != 0){
  228 + credit ="(失信)";
  229 + }
  230 +
  231 + this.truckList.push({licenseplateNo:(list[i].licenseplateNo + credit),
  232 + id:list[i].id,companyName:list[i].companyName,creditStatus:list[i].creditStatus});
186 } 233 }
187 }) 234 })
188 }); 235 });
@@ -264,10 +311,8 @@ export default { @@ -264,10 +311,8 @@ export default {
264 for (var i in this.form.licensePlate) { 311 for (var i in this.form.licensePlate) {
265 for (let j in this.truckList) { 312 for (let j in this.truckList) {
266 if (this.form.licensePlate[i] == this.truckList[j].id) { 313 if (this.form.licensePlate[i] == this.truckList[j].id) {
267 -  
268 data.objectId += this.form.licensePlate[i] + ","; 314 data.objectId += this.form.licensePlate[i] + ",";
269 data.licensePlate += this.truckList[j].licenseplateNo + ","; 315 data.licensePlate += this.truckList[j].licenseplateNo + ",";
270 -  
271 } 316 }
272 } 317 }
273 } 318 }
trash-ui/src/api/truck_credit.js
@@ -97,7 +97,6 @@ import h5Page from &#39;@/views/h5/Pagination&#39;; @@ -97,7 +97,6 @@ import h5Page from &#39;@/views/h5/Pagination&#39;;
97 methods: { 97 methods: {
98 98
99 init() { 99 init() {
100 - this.resetQuery();  
101 this.getList(); 100 this.getList();
102 getNames(this.queryParams).then(response => { 101 getNames(this.queryParams).then(response => {
103 this.dictNames = response; 102 this.dictNames = response;
@@ -148,10 +147,12 @@ import h5Page from &#39;@/views/h5/Pagination&#39;; @@ -148,10 +147,12 @@ import h5Page from &#39;@/views/h5/Pagination&#39;;
148 getData(stauts) { 147 getData(stauts) {
149 this.queryParams.status = 0; 148 this.queryParams.status = 0;
150 this.queryParams.lostCredit = stauts; 149 this.queryParams.lostCredit = stauts;
  150 + this.resetQuery();
151 this.init(); 151 this.init();
152 }, 152 },
153 getHistoryData() { 153 getHistoryData() {
154 this.queryParams.status = 1; 154 this.queryParams.status = 1;
  155 + this.resetQuery();
155 this.init(); 156 this.init();
156 }, 157 },
157 colStyle(obj) { 158 colStyle(obj) {
trash-ui/src/api/vio_casefile.js
@@ -77,21 +77,6 @@ export default { @@ -77,21 +77,6 @@ export default {
77 violationType: [ 77 violationType: [
78 {required: true, message: "必填", trigger: "blur"} 78 {required: true, message: "必填", trigger: "blur"}
79 ], 79 ],
80 - projectName: [{  
81 - required: true,  
82 - message: "必填",  
83 - trigger: "blur"  
84 - }],  
85 - describe: [{  
86 - required: true,  
87 - message: "必填",  
88 - trigger: "blur"  
89 - }],  
90 - companyName: [{  
91 - required: true,  
92 - message: "必填",  
93 - trigger: "blur"  
94 - }],  
95 }, 80 },
96 caseType: [{code: 0, name: "进入非专用车辆"}, 81 caseType: [{code: 0, name: "进入非专用车辆"},
97 {code: 1, name: "无许可手续(工)"}, 82 {code: 1, name: "无许可手续(工)"},
@@ -124,7 +109,7 @@ export default { @@ -124,7 +109,7 @@ export default {
124 {code: 28, name: "其他4"}, 109 {code: 28, name: "其他4"},
125 {code: 29, name: "其他5"}], 110 {code: 29, name: "其他5"}],
126 111
127 - projectNameList: [], 112 + projectNameList: {},
128 isLoading: false, 113 isLoading: false,
129 fileEntityList: [], 114 fileEntityList: [],
130 companyList: [], 115 companyList: [],
@@ -174,12 +159,11 @@ export default { @@ -174,12 +159,11 @@ export default {
174 159
175 160
176 constructionsitesList(this.remoteQueryData).then(res => { 161 constructionsitesList(this.remoteQueryData).then(res => {
177 - this.projectNameList = res.result.list;  
178 - earthsitesList(this.remoteQueryData).then(res => {  
179 - for (var i in res.result.list) {  
180 - this.projectNameList.push(res.result.list[i]);  
181 - }  
182 - }); 162 + this.projectNameList["0"] = res.result.list;
  163 + });
  164 +
  165 + earthsitesList(this.remoteQueryData).then(res => {
  166 + this.projectNameList["1"] = res.result.list;
183 }); 167 });
184 168
185 169
@@ -193,15 +177,12 @@ export default { @@ -193,15 +177,12 @@ export default {
193 methods: { 177 methods: {
194 getRemoteDate(value){ 178 getRemoteDate(value){
195 this.remoteQueryData.name =value; 179 this.remoteQueryData.name =value;
196 - constructionsitesList(this.remoteQueryData).then(res => {  
197 - this.projectNameList = res.result.list;  
198 - earthsitesList(this.remoteQueryData).then(res => {  
199 - for (var i in res.result.list) {  
200 - this.projectNameList.push(res.result.list[i]);  
201 - }  
202 - });  
203 - });  
204 - 180 + constructionsitesList(this.remoteQueryData).then(res => {
  181 + this.projectNameList["0"] = res.result.list;
  182 + });
  183 + earthsitesList(this.remoteQueryData).then(res => {
  184 + this.projectNameList["1"] = res.result.list;
  185 + });
205 }, 186 },
206 selectArea(item) { 187 selectArea(item) {
207 188
@@ -248,6 +229,9 @@ export default { @@ -248,6 +229,9 @@ export default {
248 readBy: null, 229 readBy: null,
249 readTime: null 230 readTime: null
250 }; 231 };
  232 + this.rules.companyName = [{required: false, message: "必填", trigger: "blur"}]
  233 + this.rules.projectName = [{required: false, message: "必填", trigger: "blur"}]
  234 +
251 this.resetForm("form"); 235 this.resetForm("form");
252 }, 236 },
253 /** 搜索按钮操作 */ 237 /** 搜索按钮操作 */
@@ -491,8 +475,6 @@ export default { @@ -491,8 +475,6 @@ export default {
491 }, 475 },
492 /** 生成违规描述 */ 476 /** 生成违规描述 */
493 createDescribe() { 477 createDescribe() {
494 - this.rules.companyName = [{required: true, message: "必填", trigger: "blur"}]  
495 - this.rules.projectName = [{required: true, message: "必填", trigger: "blur"}]  
496 this.$refs["form"].validate(valid => { 478 this.$refs["form"].validate(valid => {
497 if (valid) { 479 if (valid) {
498 let formData = this.form; 480 let formData = this.form;
@@ -504,7 +486,11 @@ export default { @@ -504,7 +486,11 @@ export default {
504 const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes(); 486 const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
505 const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds(); 487 const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
506 const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`; 488 const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
507 - this.form.describe = code + formData.companyName + "在" + formData.projectName + "出现" + formData.violationType; 489 +
  490 + let companyName = formData.companyName ? formData.companyName : "";
  491 + let projectName = formData.projectName ? formData.projectName : "";
  492 +
  493 + this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
508 this.rules.companyName = null; 494 this.rules.companyName = null;
509 this.rules.projectName = null; 495 this.rules.projectName = null;
510 } 496 }
trash-ui/src/api/warningInfo.js
@@ -102,21 +102,6 @@ export default { @@ -102,21 +102,6 @@ export default {
102 message: "必填", 102 message: "必填",
103 trigger: "blur" 103 trigger: "blur"
104 }], 104 }],
105 - projectName: [{  
106 - required: true,  
107 - message: "必填",  
108 - trigger: "blur"  
109 - }],  
110 - describe: [{  
111 - required: true,  
112 - message: "必填",  
113 - trigger: "blur"  
114 - }],  
115 - companyName: [{  
116 - required: true,  
117 - message: "必填",  
118 - trigger: "blur"  
119 - }],  
120 }, 105 },
121 caseType: [{ 106 caseType: [{
122 code: 0, 107 code: 0,
@@ -179,7 +164,7 @@ export default { @@ -179,7 +164,7 @@ export default {
179 name: "失信车辆作业" 164 name: "失信车辆作业"
180 } 165 }
181 ], 166 ],
182 - projectNameList: [], 167 + projectNameList: {},
183 isLoading: false, 168 isLoading: false,
184 fileEntityList: [], 169 fileEntityList: [],
185 companyList: [], 170 companyList: [],
@@ -229,22 +214,16 @@ export default { @@ -229,22 +214,16 @@ export default {
229 }); 214 });
230 215
231 216
232 - getEarthSitesList().then(res => {  
233 - for (var i in res.data) {  
234 - this.projectNameList.push({  
235 - name: res.data[i].name  
236 - });  
237 - } 217 + constructionsitesList(this.remoteQueryData).then(res => {
  218 + this.projectNameList["0"] = res.result.list;
238 }); 219 });
239 - getConstructionList().then(res => {  
240 - for (var i in res.data) {  
241 - this.projectNameList.push({  
242 - name: res.data[i].name  
243 - });  
244 - } 220 +
  221 + earthsitesList(this.remoteQueryData).then(res => {
  222 + this.projectNameList["1"] = res.result.list;
245 }); 223 });
246 224
247 225
  226 +
248 getCompanyList(this.remoteQueryData).then(res => { 227 getCompanyList(this.remoteQueryData).then(res => {
249 this.companyList = res.data; 228 this.companyList = res.data;
250 }); 229 });
@@ -297,6 +276,9 @@ export default { @@ -297,6 +276,9 @@ export default {
297 replyTwo: null, 276 replyTwo: null,
298 replyThree: null 277 replyThree: null
299 }; 278 };
  279 +
  280 + this.rules.companyName = [{required: false, message: "必填", trigger: "blur"}]
  281 + this.rules.projectName = [{required: false, message: "必填", trigger: "blur"}]
300 this.resetForm("form"); 282 this.resetForm("form");
301 }, 283 },
302 /** 搜索按钮操作 */ 284 /** 搜索按钮操作 */
@@ -559,16 +541,7 @@ export default { @@ -559,16 +541,7 @@ export default {
559 }, 541 },
560 /** 生成违规描述 */ 542 /** 生成违规描述 */
561 createDescribe() { 543 createDescribe() {
562 - this.rules.companyName = [{  
563 - required: true,  
564 - message: "必填",  
565 - trigger: "blur"  
566 - }]  
567 - this.rules.projectName = [{  
568 - required: true,  
569 - message: "必填",  
570 - trigger: "blur"  
571 - }] 544 +
572 this.$refs["form"].validate(valid => { 545 this.$refs["form"].validate(valid => {
573 if (valid) { 546 if (valid) {
574 let formData = this.form; 547 let formData = this.form;
@@ -580,8 +553,12 @@ export default { @@ -580,8 +553,12 @@ export default {
580 const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes(); 553 const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
581 const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds(); 554 const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
582 const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`; 555 const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
583 - this.form.describe = code + formData.companyName + "在" + formData.projectName + "出现" + formData  
584 - .violationType; 556 +
  557 + let companyName = formData.companyName ? formData.companyName : "";
  558 + let projectName = formData.projectName ? formData.projectName : "";
  559 +
  560 + this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
  561 +
585 this.rules.companyName = null; 562 this.rules.companyName = null;
586 this.rules.projectName = null; 563 this.rules.projectName = null;
587 } 564 }
trash-ui/src/assets/styles/index.scss
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
5 @import './sidebar.scss'; 5 @import './sidebar.scss';
6 @import './btn.scss'; 6 @import './btn.scss';
7 7
  8 +.el-select-dropdown__item{
  9 + width:300px;
  10 +}
8 .pagination-container{ 11 .pagination-container{
9 position: fixed; 12 position: fixed;
10 bottom: 0px; 13 bottom: 0px;
trash-ui/src/layout/index33.vue renamed to trash-ui/src/layout/index444.vue
trash-ui/src/main.js
@@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree @@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree
37 Vue.prototype.parseStatus = parseStatus 37 Vue.prototype.parseStatus = parseStatus
38 Vue.prototype.checkPer = checkPermi 38 Vue.prototype.checkPer = checkPermi
39 39
40 -Vue.prototype.remoteFrame = "http://183.66.242.6:14601"  
41 -// Vue.prototype.remoteFrame = "http://175.6.47.84:8008" 40 +// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
  41 +Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
42 42
43 Vue.prototype.msgSuccess = function (msg) { 43 Vue.prototype.msgSuccess = function (msg) {
44 this.$message({ showClose: true, message: msg, type: "success" }); 44 this.$message({ showClose: true, message: msg, type: "success" });
trash-ui/src/store/getters.js
@@ -11,6 +11,7 @@ const getters = { @@ -11,6 +11,7 @@ const getters = {
11 nickName: state => state.user.nickName, 11 nickName: state => state.user.nickName,
12 introduction: state => state.user.introduction, 12 introduction: state => state.user.introduction,
13 roles: state => state.user.roles, 13 roles: state => state.user.roles,
  14 + roleIds: state => state.user.roleIds,
14 permissions: state => state.user.permissions, 15 permissions: state => state.user.permissions,
15 permission_routes: state => state.permission.routes 16 permission_routes: state => state.permission.routes
16 } 17 }
trash-ui/src/store/modules/user.js
@@ -9,6 +9,7 @@ const user = { @@ -9,6 +9,7 @@ const user = {
9 nickName:'', 9 nickName:'',
10 avatar: '', 10 avatar: '',
11 roles: [], 11 roles: [],
  12 + roleIds: [],
12 permissions: [] 13 permissions: []
13 }, 14 },
14 15
@@ -31,6 +32,9 @@ const user = { @@ -31,6 +32,9 @@ const user = {
31 SET_ROLES: (state, roles) => { 32 SET_ROLES: (state, roles) => {
32 state.roles = roles 33 state.roles = roles
33 }, 34 },
  35 + SET_ROLEIDS: (state, roleIds) => {
  36 + state.roleIds = roleIds
  37 + },
34 SET_PERMISSIONS: (state, permissions) => { 38 SET_PERMISSIONS: (state, permissions) => {
35 state.permissions = permissions 39 state.permissions = permissions
36 } 40 }
@@ -62,6 +66,7 @@ const user = { @@ -62,6 +66,7 @@ const user = {
62 const avatar = res.user.avatar; 66 const avatar = res.user.avatar;
63 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 67 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
64 commit('SET_ROLES', res.roles) 68 commit('SET_ROLES', res.roles)
  69 + commit('SET_ROLEIDS', res.user.roleIds)
65 commit('SET_PERMISSIONS', res.permissions) 70 commit('SET_PERMISSIONS', res.permissions)
66 } else { 71 } else {
67 commit('SET_ROLES', ['ROLE_DEFAULT']) 72 commit('SET_ROLES', ['ROLE_DEFAULT'])
@@ -82,6 +87,7 @@ const user = { @@ -82,6 +87,7 @@ const user = {
82 logout(state.token).then(() => { 87 logout(state.token).then(() => {
83 commit('SET_TOKEN', '') 88 commit('SET_TOKEN', '')
84 commit('SET_ROLES', []) 89 commit('SET_ROLES', [])
  90 + commit('SET_ROLEIDS', [])
85 commit('SET_PERMISSIONS', []) 91 commit('SET_PERMISSIONS', [])
86 removeToken() 92 removeToken()
87 resolve() 93 resolve()
trash-ui/src/views/activiti/task/index.vue
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </el-option> 11 </el-option>
12 </el-select> 12 </el-select>
13 13
14 - <el-select v-model="queryParams.name" filterable allow-create reserve-keyword :filter-method="remoteName" placeholder="名称"> 14 + <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
15 <el-option v-for="item in names" :label="item" :value="item"> 15 <el-option v-for="item in names" :label="item" :value="item">
16 </el-option> 16 </el-option>
17 </el-select> 17 </el-select>
@@ -405,6 +405,18 @@ @@ -405,6 +405,18 @@
405 <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择" @select="handleSelect"/> 405 <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择" @select="handleSelect"/>
406 </el-form-item> 406 </el-form-item>
407 </el-form> 407 </el-form>
  408 + <div v-for="item in this.form.formData">
  409 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  410 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  411 + </div>
  412 +
  413 +
  414 + <el-table :data="hisfromData" v-if="hisfromData != null">
  415 + <el-table-column label="审批意见" align="center" prop="controlValue"/>
  416 + <el-table-column label="审批人" align="center" prop="createName"/>
  417 + <el-table-column label="审批时间" align="center" prop="createTime"/>
  418 + </el-table>
  419 +
408 <div slot="footer" class="dialog-footer"> 420 <div slot="footer" class="dialog-footer">
409 <div slot="footer" class="dialog-footer"> 421 <div slot="footer" class="dialog-footer">
410 <el-button type="danger" @click="handleAffairsSubmitForm(1)" 422 <el-button type="danger" @click="handleAffairsSubmitForm(1)"
trash-ui/src/views/activiti/task/sitePaper.vue
@@ -54,30 +54,6 @@ @@ -54,30 +54,6 @@
54 </el-row> 54 </el-row>
55 55
56 <el-row class="bd_bottom"> 56 <el-row class="bd_bottom">
57 - <el-col :span="6" class="bd_right bd_padding">视频监控设施</el-col>  
58 - <el-col :span="18" class="bd_padding">球机({{infoData.monitorBall}})台 枪机({{infoData.monitorGun}})台</el-col>  
59 - </el-row>  
60 - <el-row class="bd_bottom">  
61 - <el-col :span="6" >洗车作业平台及配套设施设备情况</el-col>  
62 - <el-col :span="18" class="bd_left">  
63 - <el-row class="bd_bottom">  
64 - <el-col :span="6" class="bd_right bd_padding">净车出场保洁设施</el-col>  
65 - <el-col :span="18" class="bd_padding">  
66 - 长度({{infoData.carWasherLength}}米)  
67 - 宽度({{infoData.carWasherWidth}}米)  
68 - 挡板高度({{infoData.carWasherHeight}}米)  
69 - 自动感应装置({{infoData.carWasherResponseName}})  
70 - </el-col>  
71 - </el-row>  
72 - <el-row >  
73 - <el-col :span="6" class="bd_right bd_padding">照明设施</el-col>  
74 - <el-col :span="18" class="bd_padding">  
75 - 照明设施({{infoData.lightingFacilities}}盏)  
76 - </el-col>  
77 - </el-row>  
78 - </el-col>  
79 - </el-row>  
80 - <el-row class="bd_bottom">  
81 <el-col :span="6" >申报资料</el-col> 57 <el-col :span="6" >申报资料</el-col>
82 <el-col :span="18" class="bd_left"> 58 <el-col :span="18" class="bd_left">
83 <el-row class="bd_bottom"> 59 <el-row class="bd_bottom">
@@ -157,7 +133,7 @@ @@ -157,7 +133,7 @@
157 </div> 133 </div>
158 </template> 134 </template>
159 135
160 -<script src="../../../api/constructionInfo"> 136 +<script src="../../../api/sitePaper">
161 137
162 </script> 138 </script>
163 <style> 139 <style>
trash-ui/src/views/business/supervisionSpecial/index.vue
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <el-col :span="12"> 74 <el-col :span="12">
75 <el-form-item label="项目名称" prop="title"> 75 <el-form-item label="项目名称" prop="title">
76 <el-select v-model="form.title" placeholder="项目名称"> 76 <el-select v-model="form.title" placeholder="项目名称">
77 - <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" 77 + <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :title="item.name"
78 @click.native="selectName(item)"/> 78 @click.native="selectName(item)"/>
79 </el-select> 79 </el-select>
80 </el-form-item> 80 </el-form-item>
trash-ui/src/views/business/truckActivate/index.vue
@@ -95,19 +95,20 @@ @@ -95,19 +95,20 @@
95 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 95 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
96 <el-form-item label="所属工地" prop="construction"> 96 <el-form-item label="所属工地" prop="construction">
97 <el-select v-model="form.construction" placeholder="请选择所属工地" filterable reserve-keyword @change="getCompany"> 97 <el-select v-model="form.construction" placeholder="请选择所属工地" filterable reserve-keyword @change="getCompany">
98 - <el-option v-for="item in constList" :label="item.name" :value="item.name" ></el-option> 98 + <el-option v-for="item in constList" :label="item.name" :value="item.name" :title="item.name"></el-option>
99 </el-select> 99 </el-select>
100 </el-form-item> 100 </el-form-item>
101 <el-form-item label="所属企业" prop="company"> 101 <el-form-item label="所属企业" prop="company">
102 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck"> 102 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
103 <el-option v-for="item in companyList" :label="item.name" :value="item.name" 103 <el-option v-for="item in companyList" :label="item.name" :value="item.name"
104 - v-if="!simpleName || item.name.indexOf(simpleName) > -1" 104 + v-if="!simpleName || simpleName == item.name"
105 /> 105 />
106 </el-select> 106 </el-select>
107 </el-form-item> 107 </el-form-item>
108 <el-form-item label="车牌号" prop="licensePlate"> 108 <el-form-item label="车牌号" prop="licensePlate">
109 <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable> 109 <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>
110 <el-option v-if="(form.company && form.company == item.companyName)" 110 <el-option v-if="(form.company && form.company == item.companyName)"
  111 + :disabled="item.creditStatus != 0"
111 v-for="item in truckList" 112 v-for="item in truckList"
112 :label="item.licenseplateNo" 113 :label="item.licenseplateNo"
113 :value="item.id"/> 114 :value="item.id"/>
trash-ui/src/views/caseOffline/caseOffline/index.vue
@@ -97,8 +97,11 @@ @@ -97,8 +97,11 @@
97 </el-select> 97 </el-select>
98 </el-form-item> 98 </el-form-item>
99 <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName"> 99 <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
100 - <el-select v-model="form.siteName" placeholder="请选择类型" allow-create filterable @change="getSite(item)">  
101 - <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name"/> 100 + <el-select
  101 + :popper-append-to-body="false" class="product-style"
  102 + v-model="form.siteName" placeholder="请选择类型"
  103 + allow-create filterable @change="getSite(item)">
  104 + <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" :title="item.name"/>
102 </el-select> 105 </el-select>
103 </el-form-item> 106 </el-form-item>
104 <el-form-item label="问题描述" prop="caseDec"> 107 <el-form-item label="问题描述" prop="caseDec">
trash-ui/src/views/casefile/violationCaseFile/index.vue
@@ -174,10 +174,13 @@ @@ -174,10 +174,13 @@
174 </el-col> 174 </el-col>
175 <el-col :span="11"> 175 <el-col :span="11">
176 <el-form-item label="违规对象" prop="projectName"> 176 <el-form-item label="违规对象" prop="projectName">
177 - <el-select v-model="form.projectName" :filterable="true"  
178 - :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;" 177 + <el-select
  178 + v-model="form.projectName"
  179 + :filterable="true"
  180 + :remote-method="projectNameLoadOptions"
  181 + :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"
179 :filter-method="getRemoteDate"> 182 :filter-method="getRemoteDate">
180 - <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option> 183 + <el-option v-for="item in projectNameList[form.violationObjectType]" :key="item.name" :label="item.name" :value="item.name" :title="item.name"></el-option>
181 </el-select> 184 </el-select>
182 </el-form-item> 185 </el-form-item>
183 </el-col> 186 </el-col>
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <el-form ref="queryForm" :inline="true" label-width="105px"> 3 <el-form ref="queryForm" :inline="true" label-width="105px">
4 <el-form-item label="所属区域" prop="owningRegion"> 4 <el-form-item label="所属区域" prop="owningRegion">
5 <el-select v-model="owningRegion" placeholder="请选择所属区域" clearable size="small"> 5 <el-select v-model="owningRegion" placeholder="请选择所属区域" clearable size="small">
6 - <el-option v-for="item in areas" :label="item.name" :value="item.name"/> 6 + <el-option v-for="item in areas" :label="item.name" :value="item.name" />
7 </el-select> 7 </el-select>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item label="日期" prop="createTime"> 9 <el-form-item label="日期" prop="createTime">
trash-ui/src/views/casefile/violationWarningInformation/index.vue
@@ -165,8 +165,10 @@ @@ -165,8 +165,10 @@
165 </el-col> 165 </el-col>
166 <el-col :span="11"> 166 <el-col :span="11">
167 <el-form-item label="项目名称" prop="projectName"> 167 <el-form-item label="项目名称" prop="projectName">
168 - <el-select v-model="form.projectName" :filterable="true" :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">  
169 - <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option> 168 + <el-select v-model="form.projectName" :filterable="true"
  169 + :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">
  170 + <el-option v-for="item in projectNameList[form.violationObjectType]"
  171 + :label="item.name" :value="item.name" :title="item.name"></el-option>
170 </el-select> 172 </el-select>
171 </el-form-item> 173 </el-form-item>
172 </el-col> 174 </el-col>
trash-ui/src/views/h5/dayWorkReport/index.vue
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <!-- <el-input v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称" size="small" />--> 30 <!-- <el-input v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称" size="small" />-->
31 31
32 <el-select v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称 " filterable size="small"> 32 <el-select v-model="queryParams.earthsitesName" placeholder="请输入处理场所名称 " filterable size="small">
33 - <el-option v-for="item in enames" :label="item" :value="item" /> 33 + <el-option v-for="item in enames" :label="item" :value="item" :title="item.name"/>
34 </el-select> 34 </el-select>
35 </el-form-item> 35 </el-form-item>
36 <el-form-item label="工地区属" > 36 <el-form-item label="工地区属" >
trash-ui/src/views/h5/task/sitePaper.vue
@@ -50,31 +50,6 @@ @@ -50,31 +50,6 @@
50 <el-col :span="6" class="bd_right bd_padding">处置许可时间</el-col> 50 <el-col :span="6" class="bd_right bd_padding">处置许可时间</el-col>
51 <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col> 51 <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col>
52 </el-row> 52 </el-row>
53 -  
54 - <el-row class="bd_bottom">  
55 - <el-col :span="6" class="bd_right bd_padding">视频监控设施</el-col>  
56 - <el-col :span="18" class="bd_padding">球机({{infoData.monitorBall}})台 枪机({{infoData.monitorGun}})台</el-col>  
57 - </el-row>  
58 - <el-row class="bd_bottom">  
59 - <el-col :span="6" >洗车作业平台及配套设施设备情况</el-col>  
60 - <el-col :span="18" class="bd_left">  
61 - <el-row class="bd_bottom">  
62 - <el-col :span="6" class="bd_right bd_padding">净车出场保洁设施</el-col>  
63 - <el-col :span="18" class="bd_padding">  
64 - 长度({{infoData.carWasherLength}}米)  
65 - 宽度({{infoData.carWasherWidth}}米)  
66 - 挡板高度({{infoData.carWasherHeight}}米)  
67 - 自动感应装置({{infoData.carWasherResponseName}})  
68 - </el-col>  
69 - </el-row>  
70 - <el-row >  
71 - <el-col :span="6" class="bd_right bd_padding">照明设施</el-col>  
72 - <el-col :span="18" class="bd_padding">  
73 - 照明设施({{infoData.lightingFacilities}}盏)  
74 - </el-col>  
75 - </el-row>  
76 - </el-col>  
77 - </el-row>  
78 <el-row class="bd_bottom"> 53 <el-row class="bd_bottom">
79 <el-col :span="6" >申报资料</el-col> 54 <el-col :span="6" >申报资料</el-col>
80 <el-col :span="18" class="bd_left"> 55 <el-col :span="18" class="bd_left">
trash-ui/src/views/h5/threestep/index.vue
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 </el-form-item> 92 </el-form-item>
93 <el-form-item :label="labelName" prop="name" v-if="form.type!=null"> 93 <el-form-item :label="labelName" prop="name" v-if="form.type!=null">
94 <el-select v-model="form.name" filterable reserve-keyword @change="getObjId" :filter-method="getObjId"> 94 <el-select v-model="form.name" filterable reserve-keyword @change="getObjId" :filter-method="getObjId">
95 - <el-option v-for="item in remoteData" :label="item.name" 95 + <el-option v-for="item in remoteData" :label="item.name" :title="item.name"
96 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place"> 96 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
97 </el-option> 97 </el-option>
98 </el-select> 98 </el-select>
trash-ui/src/views/h5/truckActivate/index.vue
@@ -99,21 +99,22 @@ @@ -99,21 +99,22 @@
99 <el-option v-for="item in constList" :label="item.name" :value="item.name" ></el-option> 99 <el-option v-for="item in constList" :label="item.name" :value="item.name" ></el-option>
100 </el-select> 100 </el-select>
101 </el-form-item> 101 </el-form-item>
102 - <el-form-item label="所属企业" prop="company"> 102 + <el-form-item label="所属企业" prop="company">
103 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck"> 103 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
104 <el-option v-for="item in companyList" :label="item.name" :value="item.name" 104 <el-option v-for="item in companyList" :label="item.name" :value="item.name"
105 - v-if="!simpleName || item.name.indexOf(simpleName) > -1" 105 + v-if="!simpleName || simpleName == item.name"
106 /> 106 />
107 </el-select> 107 </el-select>
108 - </el-form-item>  
109 - <el-form-item label="车牌号" prop="licensePlate">  
110 - <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>  
111 - <el-option v-if="(form.company && form.company == item.companyName)"  
112 - v-for="item in truckList"  
113 - :label="item.licenseplateNo"  
114 - :value="item.id"/>  
115 - </el-select>  
116 - </el-form-item> 108 + </el-form-item>
  109 + <el-form-item label="车牌号" prop="licensePlate">
  110 + <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>
  111 + <el-option v-if="(form.company && form.company == item.companyName)"
  112 + :disabled="item.creditStatus != 0"
  113 + v-for="item in truckList"
  114 + :label="item.licenseplateNo"
  115 + :value="item.id"/>
  116 + </el-select>
  117 + </el-form-item>
117 </el-form> 118 </el-form>
118 <div slot="footer" class="dialog-footer"> 119 <div slot="footer" class="dialog-footer">
119 <el-button type="primary" @click="submitForm">确 定</el-button> 120 <el-button type="primary" @click="submitForm">确 定</el-button>
trash-ui/src/views/h5/violationCaseFile/index.vue
@@ -242,7 +242,5 @@ @@ -242,7 +242,5 @@
242 <script src="@/api/vio_casefile"> 242 <script src="@/api/vio_casefile">
243 </script> 243 </script>
244 <style scope> 244 <style scope>
245 - .el-select-dropdown__item{  
246 - width:300px;  
247 - } 245 +
248 </style> 246 </style>
trash-ui/src/views/other/projectCheck/index.vue
@@ -449,7 +449,7 @@ @@ -449,7 +449,7 @@
449 <el-col :span="12"> 449 <el-col :span="12">
450 <el-form-item label="工程名称" prop="name"> 450 <el-form-item label="工程名称" prop="name">
451 <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable reserve-keyword> 451 <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable reserve-keyword>
452 - <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :key="item.id" @click.native="form.place = item.areaCode;"> 452 + <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :key="item.id" :title="item.name" @click.native="form.place = item.areaCode;">
453 </el-option> 453 </el-option>
454 </el-select> 454 </el-select>
455 </el-form-item> 455 </el-form-item>