diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 80faee1..86a6603 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -158,5 +158,9 @@ module.exports = { calibrationsuccessful: 'Calibration Successful', calibrationfailed: 'Calibration Failed', calibrationresultabnormal: 'Calibration Result Abnormal', - calibrationprogramabnormal: 'Calibration Program Abnormal' + calibrationprogramabnormal: 'Calibration Program Abnormal', + service: 'Service', + vehicle: ' Vehicle', + scheduling: 'Scheduling', + taskscurrentlynotcarried: 'There are tasks in progress currently, so mapping cannot be carried out.' } diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 11ba88b..df309d5 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -158,5 +158,9 @@ module.exports = { calibrationsuccessful: '标定成功', calibrationfailed: '标定失败', calibrationresultabnormal: '标定结果异常', - calibrationprogramabnormal: '标定程序异常' + calibrationprogramabnormal: '标定程序异常', + service: '服务', + vehicle: '车辆', + scheduling: '调度', + taskscurrentlynotcarried: '当前有任务正在进行,不能建图' } diff --git a/src/main.js b/src/main.js index fa61ed7..450d432 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,7 @@ import store from './vuex/store' import './style/reset.css' import { Row, Col, Button, Icon, Dialog, Form, FormItem, Input, Select, Option, Table, TableColumn, Tabs, TabPane, Popover, Loading, MessageBox, Message, Progress, Upload, Menu, MenuItem } from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' +import './style/iconfont/iconfont.css' import './style/common.styl' import i18n from './i18n/i18n' import './config/rem.js' diff --git a/src/pages/modules/build/index.vue b/src/pages/modules/build/index.vue index 4e69607..b6e7747 100644 --- a/src/pages/modules/build/index.vue +++ b/src/pages/modules/build/index.vue @@ -234,7 +234,8 @@ export default { this.loading.close() this.$confirm(this.$t('Whetherdrivebackpoint'), this.$t('Prompt'), { confirmButtonText: this.$t('yes'), - cancelButtonText: this.$t('no') + cancelButtonText: this.$t('no'), + closeOnClickModal: false }).then(() => { this._sendAutoBack('0') this.backActive = false @@ -567,6 +568,7 @@ export default { cancelButtonText: this.$t('Cancel') }).then(() => { this.tipShow = false + this.recordPath = true }).catch(() => {}) } } diff --git a/src/pages/modules/home.vue b/src/pages/modules/home.vue index 2527a8f..8be0867 100644 --- a/src/pages/modules/home.vue +++ b/src/pages/modules/home.vue @@ -19,14 +19,14 @@ export default { } }, computed: { - ...mapGetters(['userRole']), + ...mapGetters(['userRole', 'taskSeq']), nav () { return [ { title: '操作', zh_title: '操作', en_title: 'Operate', router: '/index/device', icon: 'RF1', isVisible: true }, { title: '建图', zh_title: '建图', en_title: 'Map - building', router: '/index/building', icon: 'RF2', isVisible: this.userRole === 1 }, { title: '地图', zh_title: '地图', en_title: 'Map', router: '/index/map', icon: 'RF3', isVisible: true }, { title: '重定位', zh_title: '重定位', en_title: 'Relocate', router: '/index/relocation', icon: 'RF4', isVisible: true }, - { title: '一键标定', zh_title: '一键标定', en_title: 'One - Click Calibration', router: '/index/calibration', icon: 'RF7', isVisible: true } + { title: '一键标定', zh_title: '一键标定', en_title: 'One - Click Calibration', router: '/index/calibration', icon: 'RF7', isVisible: this.userRole === 1 } ] }, visibleNav () { @@ -36,6 +36,13 @@ export default { methods: { toPage (e) { if (e.router === '/index/building') { + if (this.taskSeq) { + this.$message({ + type: 'info', + message: '当前有任务正在进行,不能建图' + }) + return + } this.$confirm(this.$t('Donewmap'), this.$t('Prompt'), { confirmButtonText: this.$t('Confirm'), cancelButtonText: this.$t('Cancel') diff --git a/src/pages/shells/index.vue b/src/pages/shells/index.vue index 959923a..44cee5f 100644 --- a/src/pages/shells/index.vue +++ b/src/pages/shells/index.vue @@ -6,7 +6,7 @@ -
+
{{ topInfo.isManual ? $t('ManualMode') : $t('AutomaticMode')}}
{{ topInfo.state }}
@@ -35,7 +35,7 @@
-
+
@@ -45,20 +45,27 @@
-
- - {{ connectionErrorMessage }} -
+ +
+ + \ No newline at end of file diff --git a/src/style/common.styl b/src/style/common.styl index 15f0b33..ea9cf34 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -1,10 +1,4 @@ @import 'mixin.styl' -@font-face { - font-family: 'iconfont'; - src: url('iconfont/iconfont.woff2?t=1631676179964') format('woff2'), - url('iconfont/iconfont.woff?t=1631676179964') format('woff'), - url('iconfont/iconfont.ttf?t=1631676179964') format('truetype'); -} @font-face { font-family: "YouSheBiaoTiHei"; src: url('font/YouSheBiaoTiHei.ttf') format('truetype'); @@ -236,6 +230,8 @@ .el-message-box__message p font-size .2rem line-height: .22rem +.el-message-box__btns button:nth-child(2) + margin-left 30px .el-progress-bar__inner,.el-progress-bar__outer border-radius 0 .el-progress__text diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl deleted file mode 100644 index 5f068b2..0000000 --- a/src/style/iconfont.styl +++ /dev/null @@ -1,21 +0,0 @@ -.icon_dropdown - &::before - content: '\e65b' -.icon_eyeopen - &::before - content: '\ee33' -.icon_eyeclose - &::before - content: '\ee34' -.icon_admin - &::before - content: '\e7a3' -.icon_close - color: #909399 - &::before - content '\e659' -.icon_radio - position relative - color #ffffff - &::before - content '\e608' \ No newline at end of file diff --git a/src/style/iconfont/iconfont.css b/src/style/iconfont/iconfont.css new file mode 100644 index 0000000..5fdc2f0 --- /dev/null +++ b/src/style/iconfont/iconfont.css @@ -0,0 +1,31 @@ +@font-face { + font-family: "iconfont"; /* Project id 5093318 */ + src: url('iconfont.woff2?t=1776130387372') format('woff2'), + url('iconfont.woff?t=1776130387372') format('woff'), + url('iconfont.ttf?t=1776130387372') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-fuwuqi:before { + content: "\e6a4"; +} + +.icon-diaodu:before { + content: "\e6ac"; +} + +.icon-robot:before { + content: "\e661"; +} + +.icon-jiqiren:before { + content: "\e613"; +} + diff --git a/src/style/iconfont/iconfont.ttf b/src/style/iconfont/iconfont.ttf index 88a47b8..4f5ca27 100644 Binary files a/src/style/iconfont/iconfont.ttf and b/src/style/iconfont/iconfont.ttf differ diff --git a/src/style/iconfont/iconfont.woff b/src/style/iconfont/iconfont.woff index 63b6a0f..a8201e6 100644 Binary files a/src/style/iconfont/iconfont.woff and b/src/style/iconfont/iconfont.woff differ diff --git a/src/style/iconfont/iconfont.woff2 b/src/style/iconfont/iconfont.woff2 index e430731..b783d38 100644 Binary files a/src/style/iconfont/iconfont.woff2 and b/src/style/iconfont/iconfont.woff2 differ diff --git a/src/vuex/modules/data.js b/src/vuex/modules/data.js index 44001e3..a0bcc16 100644 --- a/src/vuex/modules/data.js +++ b/src/vuex/modules/data.js @@ -8,7 +8,8 @@ const state = { autoLoopEnable: '0', autoBackEnable: '', autoBackFinish: '', - ready: '' + ready: '', + taskSeq: '', } const getters = { @@ -19,7 +20,8 @@ const getters = { autoLoopEnable: state => state.autoLoopEnable, autoBackEnable: state => state.autoBackEnable, autoBackFinish: state => state.autoBackFinish, - ready: state => state.ready + ready: state => state.ready, + taskSeq: state => state.taskSeq } const actions = { @@ -57,6 +59,9 @@ const mutations = { if (Object.prototype.hasOwnProperty.call(data, 'ready')) { state.ready = data.ready } + if (Object.prototype.hasOwnProperty.call(data, 'task_seq')) { + state.taskSeq = data.task_seq + } } }