Commit 946fbbae3f74e059cda61c9802ed368e1bad9ec6
1 parent
9645a3de
装修垃圾-投放点信息管理
Showing
8 changed files
with
18 additions
and
7 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
| @@ -783,7 +783,12 @@ public class RemoteServerUtils { | @@ -783,7 +783,12 @@ public class RemoteServerUtils { | ||
| 783 | okHttpClient = getOkClient(); | 783 | okHttpClient = getOkClient(); |
| 784 | } | 784 | } |
| 785 | 785 | ||
| 786 | - token = "Bearer " + token; | 786 | + if(token.contains("durable:")) { |
| 787 | + token = "Bearer " + token.replace("durable:", ""); | ||
| 788 | + }else{ | ||
| 789 | + token = "Bearer " + token; | ||
| 790 | + } | ||
| 791 | + | ||
| 787 | String params = ""; | 792 | String params = ""; |
| 788 | 793 | ||
| 789 | if (obj != null) { | 794 | if (obj != null) { |
trash-ui/src/views/unit/businessUnit/index.vue
| @@ -264,7 +264,7 @@ export default { | @@ -264,7 +264,7 @@ export default { | ||
| 264 | }).then(function() { | 264 | }).then(function() { |
| 265 | return exportEnterprise(queryParams); | 265 | return exportEnterprise(queryParams); |
| 266 | }).then(response => { | 266 | }).then(response => { |
| 267 | - this.download(response.msg); | 267 | + this.download(response.message); |
| 268 | }) | 268 | }) |
| 269 | } | 269 | } |
| 270 | } | 270 | } |
trash-ui/src/views/unit/carInfo/index.vue
| @@ -281,7 +281,7 @@ export default { | @@ -281,7 +281,7 @@ export default { | ||
| 281 | }).then(function() { | 281 | }).then(function() { |
| 282 | return exportCarInfo(queryParams); | 282 | return exportCarInfo(queryParams); |
| 283 | }).then(response => { | 283 | }).then(response => { |
| 284 | - this.download(response.msg); | 284 | + this.download(response.message); |
| 285 | }) | 285 | }) |
| 286 | } | 286 | } |
| 287 | } | 287 | } |
trash-ui/src/views/unit/carInfo/info.vue
| @@ -677,6 +677,12 @@ export default { | @@ -677,6 +677,12 @@ export default { | ||
| 677 | }); | 677 | }); |
| 678 | return; | 678 | return; |
| 679 | } | 679 | } |
| 680 | + if(this.drivers.length===0){ | ||
| 681 | + return this.$message({ | ||
| 682 | + message: '请选择驾驶员！', | ||
| 683 | + type: 'warning' | ||
| 684 | + }); | ||
| 685 | + } | ||
| 680 | this.form.drivers = this.drivers.join(","); | 686 | this.form.drivers = this.drivers.join(","); |
| 681 | this.roadTransport.forEach(item => { | 687 | this.roadTransport.forEach(item => { |
| 682 | if (item.raw != null) { | 688 | if (item.raw != null) { |
trash-ui/src/views/unit/disposalSite/index.vue
| @@ -290,7 +290,7 @@ export default { | @@ -290,7 +290,7 @@ export default { | ||
| 290 | }).then(function() { | 290 | }).then(function() { |
| 291 | return exportDisposalSite(queryParams); | 291 | return exportDisposalSite(queryParams); |
| 292 | }).then(response => { | 292 | }).then(response => { |
| 293 | - this.download(response.msg); | 293 | + this.download(response.message); |
| 294 | }) | 294 | }) |
| 295 | } | 295 | } |
| 296 | } | 296 | } |
trash-ui/src/views/unit/driver/index.vue
| @@ -258,7 +258,7 @@ export default { | @@ -258,7 +258,7 @@ export default { | ||
| 258 | }).then(function() { | 258 | }).then(function() { |
| 259 | return exportDriver(queryParams); | 259 | return exportDriver(queryParams); |
| 260 | }).then(response => { | 260 | }).then(response => { |
| 261 | - this.download(response.msg); | 261 | + this.download(response.message); |
| 262 | }) | 262 | }) |
| 263 | } | 263 | } |
| 264 | } | 264 | } |
trash-ui/src/views/unit/dropPointInfo/index.vue
| @@ -639,7 +639,7 @@ export default { | @@ -639,7 +639,7 @@ export default { | ||
| 639 | }).then(function () { | 639 | }).then(function () { |
| 640 | return exportDropPointInfo(queryParams); | 640 | return exportDropPointInfo(queryParams); |
| 641 | }).then(response => { | 641 | }).then(response => { |
| 642 | - this.download(response.msg); | 642 | + this.download(response.message); |
| 643 | }) | 643 | }) |
| 644 | } | 644 | } |
| 645 | } | 645 | } |
trash-ui/src/views/unit/enterprise/index.vue
| @@ -264,7 +264,7 @@ export default { | @@ -264,7 +264,7 @@ export default { | ||
| 264 | }).then(function() { | 264 | }).then(function() { |
| 265 | return exportEnterprise(queryParams); | 265 | return exportEnterprise(queryParams); |
| 266 | }).then(response => { | 266 | }).then(response => { |
| 267 | - this.download(response.msg); | 267 | + this.download(response.message); |
| 268 | }) | 268 | }) |
| 269 | } | 269 | } |
| 270 | } | 270 | } |