Commit 45674d7b590b04039bfdfa2003623137b3b5b578
1 parent
06c599be
m
Showing
6 changed files
with
9 additions
and
9 deletions
trash-admin/src/main/resources/application-dev.yml
| @@ -16,10 +16,10 @@ trash: | @@ -16,10 +16,10 @@ trash: | ||
| 16 | # 验证码类型 math 数组计算 char 字符验证 | 16 | # 验证码类型 math 数组计算 char 字符验证 |
| 17 | captchaType: math | 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-ui/dist.rar
No preview for this file type
trash-ui/src/api/truck_active.js
| @@ -368,7 +368,7 @@ export default { | @@ -368,7 +368,7 @@ export default { | ||
| 368 | } | 368 | } |
| 369 | for (let j in this.truckList) { | 369 | for (let j in this.truckList) { |
| 370 | if (this.form.licensePlate[i] == this.truckList[j].licenseplateNo) { | 370 | if (this.form.licensePlate[i] == this.truckList[j].licenseplateNo) { |
| 371 | - objs += this.form.licensePlate[i] + ","; | 371 | + objs += this.truckList[j].id+ ","; |
| 372 | licensePlates += this.truckList[j].licenseplateNo + ","; | 372 | licensePlates += this.truckList[j].licenseplateNo + ","; |
| 373 | } | 373 | } |
| 374 | } | 374 | } |
trash-ui/src/layout/index444.vue renamed to trash-ui/src/layout/inde3x.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/vue.config.js
| @@ -41,8 +41,8 @@ module.exports = { | @@ -41,8 +41,8 @@ module.exports = { | ||
| 41 | } | 41 | } |
| 42 | }, | 42 | }, |
| 43 | ['/api']: { | 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 | changeOrigin: true, | 46 | changeOrigin: true, |
| 47 | }, | 47 | }, |
| 48 | ['^/remotedown']: { | 48 | ['^/remotedown']: { |