diff --git a/src/config/mork.js b/src/config/mork.js index 1c6c576..cae0b93 100644 --- a/src/config/mork.js +++ b/src/config/mork.js @@ -201,6 +201,6 @@ export const setStation = (sn, code) => { return res } export const getReturnStation = () => { - let res = {station_id: 'B1',station_code:"111",station_name:"1111"} + let res = {station_id: 'B3333',station_code:"111",station_name:"1111"} return res } \ No newline at end of file diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue index f4dfaaa..1726fa0 100644 --- a/src/pages/modules/building.vue +++ b/src/pages/modules/building.vue @@ -176,9 +176,6 @@ export default { clearTimeout(this.intervalId) } }, - created () { - this._startMapping() - }, mounted() { // 初始化并启动引导 this.$nextTick(() => { @@ -206,6 +203,7 @@ export default { doneBtnText: this.$t('close'), onDestroyed: () => { this.driverActive = false + this._startMapping() }, onPopoverRender: (popover, {config, state}) => { if (state.activeIndex === 0) { diff --git a/src/pages/shells/config-modal.vue b/src/pages/shells/config-modal.vue index 1206b9c..4706922 100644 --- a/src/pages/shells/config-modal.vue +++ b/src/pages/shells/config-modal.vue @@ -261,7 +261,8 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.6)' }) - let res = await updateReturnStation(this.returnPoint) + const returnPoint = this.returnPoint ? this.returnPoint : '-1' + let res = await updateReturnStation(returnPoint) if (res) { this.$message(res.message) } @@ -299,6 +300,7 @@ export default { color #fff line-height .4rem margin-bottom .2rem + white-space: nowrap; background center / 100% 100% url(../../images/new/state_title_bg.png) no-repeat .agv_button min-width .9rem