From e98df7a7ee571f54879749dbcb7789b185b3439d Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 10 Nov 2025 11:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData.js | 1 + src/config/mork.js | 36 ++++ src/main.js | 8 +- src/pages/modules/hub/index.vue | 288 +++-------------------------- src/pages/modules/hub/logs.vue | 159 ++++++++++++++++ src/pages/modules/hub/upload.vue | 291 ++++++++++++++++++++++++++++++ src/pages/modules/login/index.vue | 2 +- src/router/index.js | 15 +- src/style/common.styl | 8 + 9 files changed, 541 insertions(+), 267 deletions(-) create mode 100644 src/pages/modules/hub/logs.vue create mode 100644 src/pages/modules/hub/upload.vue diff --git a/src/config/getData.js b/src/config/getData.js index c270d64..4675a3e 100644 --- a/src/config/getData.js +++ b/src/config/getData.js @@ -5,6 +5,7 @@ export const authlogin = (username, password) => post('auth/login ', { userName: username, password: password }) + // 建图 export const startMapping = (na) => post('teaching/startMapping?mapName=' + na, {}) export const getMappingStatus = () => post('teaching/getMappingStatus', {}) diff --git a/src/config/mork.js b/src/config/mork.js index be9c515..e2f3e11 100644 --- a/src/config/mork.js +++ b/src/config/mork.js @@ -855,4 +855,40 @@ export const relocate = (x, y, angle) => { message: 'ok' } return res +} + +export const apiLogs = () => { + let res = [ + { + "fileName": "info.2025-11-03.log", + "filePath": "D:\\Procedure\\noblelift\\hangzhou\\APT15E\\logs\\root\\info.2025-11-03.log", + "fileSize": 272452, + "lastModified": [ + 2025, + 11, + 3, + 15, + 54, + 54, + 959000000 + ], + "readableSize": "266.1 KB" + }, + { + "fileName": "info.2025-10-29.log", + "filePath": "D:\\Procedure\\noblelift\\hangzhou\\APT15E\\logs\\root\\info.2025-10-29.log", + "fileSize": 0, + "lastModified": [ + 2025, + 10, + 29, + 14, + 27, + 51, + 873000000 + ], + "readableSize": "0 B" + } + ] + return res } \ No newline at end of file diff --git a/src/main.js b/src/main.js index c58778e..fa61ed7 100644 --- a/src/main.js +++ b/src/main.js @@ -3,7 +3,7 @@ import App from './App.vue' import router from './router' 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 } from 'element-ui' +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/common.styl' import i18n from './i18n/i18n' @@ -30,6 +30,8 @@ Vue.use(Popover) Vue.use(Loading) Vue.use(Progress) Vue.use(Upload) +Vue.use(Menu) +Vue.use(MenuItem) Vue.prototype.$confirm = MessageBox.confirm Vue.prototype.$message = Message Vue.prototype.$post = post @@ -45,12 +47,16 @@ Vue.prototype.$langPre = { // 从本地存储中读取 serverUrl,userRole const savedServerUrl = localStorage.getItem('serverUrl'); const savedUserRole = localStorage.getItem('userRole'); +const token = localStorage.getItem('token'); if (savedServerUrl) { store.commit('SET_BASE_URL', savedServerUrl); } if (savedUserRole) { store.commit('SET_USER_ROLE', parseInt(savedUserRole, 10)); } +if (token) { + store.commit('SET_TOKEN', token); +} Vue.filter('findByValue', (array, value) => { if (!Array.isArray(array)) return '' diff --git a/src/pages/modules/hub/index.vue b/src/pages/modules/hub/index.vue index 18f942c..220d99e 100644 --- a/src/pages/modules/hub/index.vue +++ b/src/pages/modules/hub/index.vue @@ -1,277 +1,39 @@ diff --git a/src/pages/modules/hub/logs.vue b/src/pages/modules/hub/logs.vue new file mode 100644 index 0000000..37d83c6 --- /dev/null +++ b/src/pages/modules/hub/logs.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/src/pages/modules/hub/upload.vue b/src/pages/modules/hub/upload.vue new file mode 100644 index 0000000..6e2452d --- /dev/null +++ b/src/pages/modules/hub/upload.vue @@ -0,0 +1,291 @@ + + + + + \ No newline at end of file diff --git a/src/pages/modules/login/index.vue b/src/pages/modules/login/index.vue index 8e8751c..fdda646 100644 --- a/src/pages/modules/login/index.vue +++ b/src/pages/modules/login/index.vue @@ -110,7 +110,7 @@ export default { let res = await authlogin(this.username, this.encryptData(this.password)) if (res.code === 200) { this.setToken(res.data.token) - this.$router.push('/hub?user=' + res.data.user.userName) + this.$router.push('/hub/upload') } else { this.Dialog(res.desc) } diff --git a/src/router/index.js b/src/router/index.js index 0a846eb..ecc1551 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,9 @@ const Building = r => require.ensure([], () => r(require('../pages/modules/build const Map = r => require.ensure([], () => r(require('../pages/modules/map/index.vue')), 'Map') const Relocation = r => require.ensure([], () => r(require('../pages/modules/relocation.vue')), 'Relocation') const Login = r => require.ensure([], () => r(require('../pages/modules/login/index.vue')), 'login') -const Hub = r => require.ensure([], () => r(require('../pages/modules/hub/index.vue')), 'Hub') +const IndexHub = r => require.ensure([], () => r(require('../pages/modules/hub/index.vue')), 'IndexHub') +const Upload = r => require.ensure([], () => r(require('../pages/modules/hub/upload.vue')), 'Upload') +const Logs = r => require.ensure([], () => r(require('../pages/modules/hub/logs.vue')), 'Logs') Vue.use(VueRouter) const router = new VueRouter({ @@ -47,7 +49,16 @@ const router = new VueRouter({ }, { path: '/hub', - component: Hub + component: IndexHub, + children: [ + { + path: 'upload', + component: Upload + }, { + path: 'logs', + component: Logs + } + ] } ] }) diff --git a/src/style/common.styl b/src/style/common.styl index 344e12c..99843e2 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -384,3 +384,11 @@ margin 0 !important height .44rem line-height .44rem + +.el-loading-mask { + background-color: rgba(0, 11, 41, .4) +} +// table +.el-table__body tr.hover-row>td.el-table__cell { + background-color: rgba(63,106,202,0.3) +}