diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index fe0dbd5..9bf5363 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -19,6 +19,7 @@ module.exports = { Passwordnotempty: 'WIFI cannot be empty.', Schedulingnotempty: 'Scheduling IP cannot be empty.', WIFInotempty: 'WIFI cannot be empty.', + Time: 'Time', Name: 'Name', Category: 'Category', Description: 'Description', diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 6dff629..1b16fe8 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -19,6 +19,7 @@ module.exports = { Passwordnotempty: '密码不能为空', Schedulingnotempty: '调度IP不能为空', WIFInotempty: 'WIFI不能为空', + Time: '时间', Name: '名称', Category: '类别', Description: '说明', diff --git a/src/images/new/tab_bg.png b/src/images/new/tab_bg.png new file mode 100644 index 0000000..019dc26 Binary files /dev/null and b/src/images/new/tab_bg.png differ diff --git a/src/main.js b/src/main.js index b7fa874..7db6a6f 100644 --- a/src/main.js +++ b/src/main.js @@ -7,7 +7,7 @@ import store from './vuex/store' import '@style/reset.css' import VueTouchKeyboard from 'vue-touch-keyboard' import 'vue-touch-keyboard/dist/vue-touch-keyboard.css' -import { Row, Col, Button, Icon, Dialog, Form, FormItem, Input, Select, Option, Table, TableColumn, Loading } from 'element-ui' +import { Row, Col, Button, Icon, Dialog, Form, FormItem, Input, Select, Option, Table, TableColumn, Tabs, TabPane, Popover, Loading, Message } from 'element-ui' import '@style/common.styl' import i18n from './i18n/i18n' import '@config/rem.js' @@ -26,7 +26,11 @@ Vue.use(Select) Vue.use(Option) Vue.use(Table) Vue.use(TableColumn) +Vue.use(Tabs) +Vue.use(TabPane) +Vue.use(Popover) Vue.use(Loading) +Vue.prototype.$message = Message Vue.use(VueTouchKeyboard) Vue.prototype.$post = post Vue.config.productionTip = false diff --git a/src/pages/modules/building.vue b/src/pages/modules/building.vue new file mode 100644 index 0000000..073c61f --- /dev/null +++ b/src/pages/modules/building.vue @@ -0,0 +1,128 @@ + + + + 打点 + + + 放大 + 缩小 + + + + + + + 建图 + + + + + + diff --git a/src/pages/modules/device.vue b/src/pages/modules/device.vue index 953c6b3..92f4cd7 100644 --- a/src/pages/modules/device.vue +++ b/src/pages/modules/device.vue @@ -1,126 +1,174 @@ - - - - - {{ e.point_code }} - - - - - - - - {{ e.point_code }} - - + + + + + + + + + {{ e.label }} + + {{ e.point_code }} + - - - {{$t('Empty')}} - {{$t('SendTask')}} - - - - - {{$t('HistoricalTasks')}} - - - - {{ e.point_code }} - - - - - + + + + + {{ e.point_code }} + + + + + + + {{ e.point_code }} + + + + + + + + + + + + + + {{ e.point_code }} + + {{ e.radio }} + + + + + + + + + + 删除任务链 + 取消任务 + 保存任务 + 发送任务 + + + + + diff --git a/src/pages/modules/home.vue b/src/pages/modules/home.vue index f29c91a..5234a3b 100644 --- a/src/pages/modules/home.vue +++ b/src/pages/modules/home.vue @@ -16,7 +16,7 @@ export default { return { nav: [ {title: '操作', zh_title: '操作', en_title: 'Operation', router: '/index/device'}, - {title: '建图', zh_title: '建图', en_title: 'Map building', router: ''}, + {title: '建图', zh_title: '建图', en_title: 'Map building', router: '/index/building'}, {title: '取消任务', zh_title: '取消任务', en_title: 'Cancel task', router: ''}, {title: '地图', zh_title: '地图', en_title: 'Map', router: ''} ], diff --git a/src/pages/modules/warn-modal.vue b/src/pages/modules/warn-modal.vue new file mode 100644 index 0000000..e3440c6 --- /dev/null +++ b/src/pages/modules/warn-modal.vue @@ -0,0 +1,67 @@ + + + + + 障碍物告警 + 处理方法 + 1.查看避障传感器 + + + + + + + + + + + + diff --git a/src/pages/modules/warning.vue b/src/pages/modules/warning.vue index 644fa0c..9ef50c5 100644 --- a/src/pages/modules/warning.vue +++ b/src/pages/modules/warning.vue @@ -3,37 +3,64 @@ + + + :label="$t('Name')"> + width="100"> + :label="$t('Description')" + width="400"> + + + + 查看 + +
打点
建图
{{ e.point_code }}
{{$t('Empty')}}
{{$t('SendTask')}}
{{ e.radio }}
删除任务链
取消任务
保存任务
发送任务
障碍物告警
处理方法
1.查看避障传感器