diff --git a/src/pages/modules/build/driver-modal.vue b/src/pages/modules/build/driver-modal.vue index 6f85b84..1bd16be 100644 --- a/src/pages/modules/build/driver-modal.vue +++ b/src/pages/modules/build/driver-modal.vue @@ -71,4 +71,7 @@ export default { color #fff line-height .26rem padding-top .1rem +.enClass + .step_p + line-height .22rem diff --git a/src/pages/modules/build/index.vue b/src/pages/modules/build/index.vue index 246a7de..07e58c4 100644 --- a/src/pages/modules/build/index.vue +++ b/src/pages/modules/build/index.vue @@ -47,8 +47,8 @@ @@ -78,8 +78,7 @@ export default { if (this.needsConfirmation) { this.$confirm(this.$t('Doabandonmapattempt'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(async () => { try { // 显示加载中状态 @@ -211,8 +210,7 @@ export default { this.loading.close() this.$confirm(this.$t('Whetherdrivebackpoint'), this.$t('Prompt'), { confirmButtonText: this.$t('yes'), - cancelButtonText: this.$t('no'), - type: 'warning' + cancelButtonText: this.$t('no') }).then(() => { this._sendAutoBack('0') this.backActive = false @@ -321,8 +319,7 @@ export default { if (this.autoLoopEnable !== '1') return this.$confirm(this.$t('sureendbuilding'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this._stopMapping() }).catch(() => { @@ -382,8 +379,7 @@ export default { this.keyPoints = [] this.$confirm(this.$t('Newfailedagain'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this._startMapping() }).catch(() => { @@ -399,8 +395,7 @@ export default { this.keyPoints = [] this.$confirm(this.$t('Newfailedagain'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this._startMapping() }).catch(() => { @@ -483,8 +478,7 @@ export default { forceClosed () { this.$confirm(this.$t('reversingabnormalitiesneedtoclose'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this.tipShow = false }).catch(() => {}) @@ -534,13 +528,15 @@ export default { } /* 进度条容器 */ -.progress-container { +.progress-container background-color: #fff; padding: 30px 40px; border-radius: 8px; text-align: center; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); -} + /deep/ .el-progress--line + display: flex; + align-items: center; .progress_tip { font-size: .2rem line-height: .34rem diff --git a/src/pages/modules/home.vue b/src/pages/modules/home.vue index 2c8f28a..e1c3049 100644 --- a/src/pages/modules/home.vue +++ b/src/pages/modules/home.vue @@ -37,8 +37,7 @@ export default { if (e.router === '/index/building') { this.$confirm(this.$t('Donewmap'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this.$router.push(e.router) }).catch(() => { diff --git a/src/pages/modules/relocation.vue b/src/pages/modules/relocation.vue index 65b1dbc..dc5f943 100644 --- a/src/pages/modules/relocation.vue +++ b/src/pages/modules/relocation.vue @@ -38,8 +38,7 @@ export default { toConfirm (e) { this.$confirm(this.$t('Isrelocatepoint'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this._relocate(e.x, e.y, e.angle) }).catch(() => { diff --git a/src/pages/shells/config-modal.vue b/src/pages/shells/config-modal.vue index e85a88e..aca063d 100644 --- a/src/pages/shells/config-modal.vue +++ b/src/pages/shells/config-modal.vue @@ -156,8 +156,7 @@ export default { toReboot () { this.$confirm(this.$t('Aresureshutrestart'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this._rebootVehicle() }).catch(() => { @@ -192,8 +191,7 @@ export default { synchronizedMapConfirm () { this.$confirm(this.$t('Aresuremap'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), - cancelButtonText: this.$t('Cancel'), - type: 'warning' + cancelButtonText: this.$t('Cancel') }).then(() => { this._synchronizedMap() }).catch(() => { @@ -357,4 +355,6 @@ export default { .enClass .el-tabs__item font-size .2rem + .contorl_title_2 + font-size .16rem diff --git a/src/style/common.styl b/src/style/common.styl index 99843e2..73dfd9c 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -235,7 +235,7 @@ font-size .2rem .el-message-box__message p font-size .2rem - line-height: .28rem + line-height: .2rem .el-progress-bar__inner,.el-progress-bar__outer border-radius 0 .el-progress__text