diff --git a/README.md b/README.md
index d37fa1d..a67e86e 100644
--- a/README.md
+++ b/README.md
@@ -24,4 +24,5 @@ npm run lint
See [Configuration Reference](https://cli.vuejs.org/config/).
### 项目须知
-1.屏幕视窗大小1281px * 752px
+1.屏幕视窗大小1281px * 752px;
+2.打包注意事项:选择router文件夹打包apt15e在操作屏使用,选择hubRouter文件夹打包apt15e后台在浏览器操作;
diff --git a/src/hubRouter/index.js b/src/hubRouter/index.js
new file mode 100644
index 0000000..550d286
--- /dev/null
+++ b/src/hubRouter/index.js
@@ -0,0 +1,21 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+
+// const Login = r => require.ensure([], () => r(require('../pages/modules/login/login.vue')), 'login')
+const Hub = r => require.ensure([], () => r(require('../pages/modules/hub/index.vue')), 'Hub')
+Vue.use(VueRouter)
+
+const router = new VueRouter({
+ routes: [
+ {
+ path: '/',
+ redirect: '/hub'
+ },
+ {
+ path: '/hub',
+ component: Hub
+ }
+ ]
+})
+
+export default router
diff --git a/src/main.js b/src/main.js
index aa7b919..baccb51 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,9 +1,10 @@
import Vue from 'vue'
import App from './App.vue'
-import router from './router'
+// import router from './router'
+import router from './hubRouter'
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 } from 'element-ui'
+import { Row, Col, Button, Icon, Dialog, Form, FormItem, Input, Select, Option, Table, TableColumn, Tabs, TabPane, Popover, Loading, MessageBox, Message, Progress, Upload } from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import './style/common.styl'
import i18n from './i18n/i18n'
@@ -29,6 +30,7 @@ Vue.use(TabPane)
Vue.use(Popover)
Vue.use(Loading)
Vue.use(Progress)
+Vue.use(Upload)
Vue.prototype.$confirm = MessageBox.confirm
Vue.prototype.$message = Message
Vue.prototype.$post = post
diff --git a/src/pages/modules/gl-map-4.vue b/src/pages/modules/build/gl-map-4.vue
similarity index 100%
rename from src/pages/modules/gl-map-4.vue
rename to src/pages/modules/build/gl-map-4.vue
diff --git a/src/pages/modules/gl-map.vue b/src/pages/modules/build/gl-map.vue
similarity index 99%
rename from src/pages/modules/gl-map.vue
rename to src/pages/modules/build/gl-map.vue
index b6f70a8..0b21401 100644
--- a/src/pages/modules/gl-map.vue
+++ b/src/pages/modules/build/gl-map.vue
@@ -41,7 +41,7 @@ export default {
maxY: 10 // 点云Y轴最大值
},
// 小车相关
- vehicleImage: require('../../images/new/agv.png'),
+ vehicleImage: require('@/images/new/agv.png'),
carMovementEnabled: true,
carSize: 30,
// 视图控制
diff --git a/src/pages/modules/building.vue b/src/pages/modules/build/index.vue
similarity index 99%
rename from src/pages/modules/building.vue
rename to src/pages/modules/build/index.vue
index 105a0d3..5e85a11 100644
--- a/src/pages/modules/building.vue
+++ b/src/pages/modules/build/index.vue
@@ -66,7 +66,7 @@
import GlMap from './gl-map.vue'
import { driver } from 'driver.js'
import 'driver.js/dist/driver.css'
-import { startMapping, stopMapping, getMappingStatus, setStation, oneClickDeployment, abandonMapping, sendAutoBack } from '../../config/getData.js'
+import { startMapping, stopMapping, getMappingStatus, setStation, oneClickDeployment, abandonMapping, sendAutoBack } from '@/config/getData.js'
import { mapGetters } from 'vuex'
export default {
name: 'ModuleBuilding',
diff --git a/src/pages/modules/device.vue b/src/pages/modules/device/index.vue
similarity index 98%
rename from src/pages/modules/device.vue
rename to src/pages/modules/device/index.vue
index f820b93..77e0234 100644
--- a/src/pages/modules/device.vue
+++ b/src/pages/modules/device/index.vue
@@ -69,7 +69,7 @@
+
+
diff --git a/src/pages/modules/map/map copy.vue b/src/pages/modules/map/map copy.vue
new file mode 100644
index 0000000..d6d37d9
--- /dev/null
+++ b/src/pages/modules/map/map copy.vue
@@ -0,0 +1,838 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/modules/warning.vue b/src/pages/modules/warn/index.vue
similarity index 100%
rename from src/pages/modules/warning.vue
rename to src/pages/modules/warn/index.vue
diff --git a/src/pages/modules/warn-modal.vue b/src/pages/modules/warn/warn-modal.vue
similarity index 97%
rename from src/pages/modules/warn-modal.vue
rename to src/pages/modules/warn/warn-modal.vue
index a9e67fe..59947f6 100644
--- a/src/pages/modules/warn-modal.vue
+++ b/src/pages/modules/warn/warn-modal.vue
@@ -24,7 +24,7 @@