From 53003485520606374601da2957fe5c14cacb931f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Sun, 3 May 2020 09:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E4=BB=A5tab?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zyplayer-doc-ui/db-ui/package-lock.json | 5 + zyplayer-doc-ui/db-ui/package.json | 1 + .../db-ui/src/common/config/apimix.js | 8 +- .../src/components/layouts/PageTableView.vue | 141 ++++++++++++++++++ zyplayer-doc-ui/db-ui/src/main.js | 2 + zyplayer-doc-ui/db-ui/src/routes.js | 25 +++- zyplayer-doc-ui/db-ui/src/store/index.js | 11 ++ .../db-ui/src/store/modules/global.js | 18 +++ .../db-ui/src/views/data/Executor.vue | 9 +- .../db-ui/src/views/data/Export.vue | 2 +- .../db-ui/src/views/data/TransferData.vue | 2 +- .../db-ui/src/views/table/Info.vue | 5 + 12 files changed, 212 insertions(+), 17 deletions(-) create mode 100644 zyplayer-doc-ui/db-ui/src/components/layouts/PageTableView.vue create mode 100644 zyplayer-doc-ui/db-ui/src/store/index.js create mode 100644 zyplayer-doc-ui/db-ui/src/store/modules/global.js diff --git a/zyplayer-doc-ui/db-ui/package-lock.json b/zyplayer-doc-ui/db-ui/package-lock.json index 0cc56bbd..ee9f3583 100644 --- a/zyplayer-doc-ui/db-ui/package-lock.json +++ b/zyplayer-doc-ui/db-ui/package-lock.json @@ -7374,6 +7374,11 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuex": { + "version": "3.3.0", + "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.3.0.tgz", + "integrity": "sha1-ZltGMOoTRzFxOfzFy0laqz7F5RM=" + }, "wangeditor": { "version": "3.1.1", "resolved": "https://registry.npm.taobao.org/wangeditor/download/wangeditor-3.1.1.tgz", diff --git a/zyplayer-doc-ui/db-ui/package.json b/zyplayer-doc-ui/db-ui/package.json index 5a99f468..86f6b3bd 100644 --- a/zyplayer-doc-ui/db-ui/package.json +++ b/zyplayer-doc-ui/db-ui/package.json @@ -13,6 +13,7 @@ "vue": "^2.5.16", "vue-axios": "^2.1.4", "vue-router": "^3.0.6", + "vuex": "^3.3.0", "wangeditor": "^3.1.1" }, "engines": { diff --git a/zyplayer-doc-ui/db-ui/src/common/config/apimix.js b/zyplayer-doc-ui/db-ui/src/common/config/apimix.js index 6f7c366e..9da7d2e9 100644 --- a/zyplayer-doc-ui/db-ui/src/common/config/apimix.js +++ b/zyplayer-doc-ui/db-ui/src/common/config/apimix.js @@ -5,14 +5,14 @@ var href = window.location.href; var _fn = { href: href, // 本地启动时使用本地接口调试 - // HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', - // HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', + HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', + HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', // 也可以直接使用线上的服务调试 // HOST: 'http://doc.zyplayer.com/zyplayer-doc-manage', // HOST1: 'http://doc.zyplayer.com/zyplayer-doc-manage', // 打包时使用下面这两行,文件就放在根目录下,所以当前路劲就好 - HOST: './', - HOST1: './', + // HOST: './', + // HOST1: './', mixUrl: function (host, url) { var p; diff --git a/zyplayer-doc-ui/db-ui/src/components/layouts/PageTableView.vue b/zyplayer-doc-ui/db-ui/src/components/layouts/PageTableView.vue new file mode 100644 index 00000000..b790087e --- /dev/null +++ b/zyplayer-doc-ui/db-ui/src/components/layouts/PageTableView.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/zyplayer-doc-ui/db-ui/src/main.js b/zyplayer-doc-ui/db-ui/src/main.js index 6fbbb5d5..41e8488a 100644 --- a/zyplayer-doc-ui/db-ui/src/main.js +++ b/zyplayer-doc-ui/db-ui/src/main.js @@ -10,6 +10,7 @@ import toast from './common/lib/common/toast' import VueRouter from 'vue-router' import routes from './routes' +import store from './store/index' import axios from 'axios' import VueAxios from 'vue-axios' @@ -25,6 +26,7 @@ Vue.prototype.apilist2 = apimix.apilist1; // 公用方法 Vue.prototype.common = common; Vue.prototype.toast = toast; +Vue.prototype.$store = store; const router = new VueRouter({routes}); // 路由跳转时判断处理 diff --git a/zyplayer-doc-ui/db-ui/src/routes.js b/zyplayer-doc-ui/db-ui/src/routes.js index e0adaa1f..259f081a 100644 --- a/zyplayer-doc-ui/db-ui/src/routes.js +++ b/zyplayer-doc-ui/db-ui/src/routes.js @@ -4,6 +4,8 @@ import UserLogin from './views/user/Login.vue' import UserMyInfo from './views/user/MyInfo.vue' import UserRouterView from './views/user/RouterView.vue' +import PageTableView from './components/layouts/PageTableView' + import TableInfo from './views/table/Info.vue' import TableDatabase from './views/table/Database.vue' import TableRouterView from './views/table/RouterView.vue' @@ -18,14 +20,29 @@ import CommonNoAuth from './views/common/NoAuth.vue' let routes = [ { - path: '/home', + path: '/home1', component: Home, name: '主页', meta: { requireAuth: true, } }, { - path: '/user', + path: '/', + name: 'Tab标签页', + component: PageTableView, + children: [ + {path: '/home', name: '主页',component: Home}, + {path: '/user/login', name: '系统登录',component: UserLogin, meta: {fullscreen: true}}, + {path: '/user/myInfo', name: '我的信息',component: UserMyInfo}, + {path: '/table/info', name: '表信息',component: TableInfo}, + {path: '/table/database', name: '库信息',component: TableDatabase}, + {path: '/data/datasourceManage', name: '数据源管理',component: DataDatasourceManage}, + {path: '/data/export', name: '数据库导出',component: DataExport}, + {path: '/data/executor', name: 'SQL执行器',component: DataExecutor}, + {path: '/data/transferData', name: '数据互导工具',component: DataTransferData}, + ] + }, { + path: '/user1', name: '用户管理', component: UserRouterView, children: [ @@ -33,7 +50,7 @@ let routes = [ {path: 'myInfo', name: '我的信息',component: UserMyInfo}, ] }, { - path: '/table', + path: '/table1', name: '表信息', component: TableRouterView, children: [ @@ -41,7 +58,7 @@ let routes = [ {path: 'database', name: '库信息',component: TableDatabase}, ] }, { - path: '/data', + path: '/data1', name: '数据信息', component: DataRouterView, children: [ diff --git a/zyplayer-doc-ui/db-ui/src/store/index.js b/zyplayer-doc-ui/db-ui/src/store/index.js new file mode 100644 index 00000000..669bbf24 --- /dev/null +++ b/zyplayer-doc-ui/db-ui/src/store/index.js @@ -0,0 +1,11 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import global from './modules/global' + +Vue.use(Vuex); + +export default new Vuex.Store({ + modules: { + global, + } +}); diff --git a/zyplayer-doc-ui/db-ui/src/store/modules/global.js b/zyplayer-doc-ui/db-ui/src/store/modules/global.js new file mode 100644 index 00000000..4a5471e6 --- /dev/null +++ b/zyplayer-doc-ui/db-ui/src/store/modules/global.js @@ -0,0 +1,18 @@ +export default { + namespaced: true, + state: { + pageTabNameMap: {}, + }, + getters: { + getPageTabNameMap(state) { + return state.pageTabNameMap; + } + }, + mutations: { + addTableName(state, item) { + let sameObj = Object.assign({}, state.pageTabNameMap); + sameObj[item.key] = item.val; + state.pageTabNameMap = sameObj; + }, + } +} diff --git a/zyplayer-doc-ui/db-ui/src/views/data/Executor.vue b/zyplayer-doc-ui/db-ui/src/views/data/Executor.vue index 2f3f923e..46440cca 100644 --- a/zyplayer-doc-ui/db-ui/src/views/data/Executor.vue +++ b/zyplayer-doc-ui/db-ui/src/views/data/Executor.vue @@ -1,13 +1,8 @@