diff --git a/package.json b/package.json index 8494daeaa23e2e6451fa785b66a52e4d47578642..944315eb014651f5b5dca4767dbd4586fde208c3 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "git add" ] } -} \ No newline at end of file +} diff --git a/src/components/index.js b/src/components/index.js index 56558a00b33c54bed3150562401126801376e23d..3f08fbfc86a9d45ac7da8ff14a51c69def9822fd 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,5 +1,6 @@ import Table from './table/index.vue'; import WhiteCard from './white_card/index.vue'; import Upload from './upload/index.vue'; +import MyFormItem from './table/my_item.vue'; -export { Table, WhiteCard, Upload }; +export { Table, WhiteCard, Upload, MyFormItem }; diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 2e808aa6cd2bec3c3e6f4c28974052f2fed9edb5..40af63de60c49b089e98adf518ac5b789ab3a7b9 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -51,11 +51,11 @@ placement="right" :visible="addVisible" @close="addDrawerClose" - v-if="addBtn" - :maskClosable="!!addBtn.maskClosable" + v-if="$slots.drawer" + :maskClosable="addBtn && !!addBtn.maskClosable" :drawerStyle="drawerStyle" :bodyStyle="bodyStyle" - :width="addBtn.width || 600" + :width="(addBtn && addBtn.width) || 600" destroyOnClose >
diff --git a/src/components/table/my_item.vue b/src/components/table/my_item.vue index 398a17818de8bbe87cdfbe6f8bd703aaf0e59ba3..640d360674dc8b1e70830e1fe0ba67d31c387dcf 100644 --- a/src/components/table/my_item.vue +++ b/src/components/table/my_item.vue @@ -1,7 +1,7 @@ @@ -16,6 +16,3 @@ export default { }, }; - - \ No newline at end of file diff --git a/src/main.js b/src/main.js index 903d2b3961ac88dbdc0176f43ca4a85f0c3b88dd..f19815d1867d1e34d6129736aa422e00a78fcf4d 100644 --- a/src/main.js +++ b/src/main.js @@ -68,6 +68,8 @@ loadGuards(guards, { router, store, i18n, message: Vue.prototype.$message }); loadResponseInterceptor({ router }); +Vue.prototype.$fileUrl = 'http://platform.kuopu.net:9300/'; + new Vue({ router, store, diff --git a/src/pages/frame/components/footer/LayoutCopyrightFooter.vue b/src/pages/frame/components/footer/LayoutCopyrightFooter.vue deleted file mode 100644 index 80b1dce1ec7e49fb8215c51a116f35694369c973..0000000000000000000000000000000000000000 --- a/src/pages/frame/components/footer/LayoutCopyrightFooter.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - - diff --git a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue index 3bfe73c30a198672cac603c31fca1f6b7fab1f00..e5c4d66c06fb53203f8915d261270245700d39b2 100644 --- a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue +++ b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/system/view/log/operation/index.vue b/src/pages/system/view/log/operation/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..87f09df26c8d56f4faaeaf235b0d4a81a5c76c87 --- /dev/null +++ b/src/pages/system/view/log/operation/index.vue @@ -0,0 +1,76 @@ + + + diff --git a/src/pages/system/view/organization/usermanagement/User.vue b/src/pages/system/view/organization/usermanagement/User.vue index 2c2a29a9f2456b2b645dc227d202b5bbbf9789c7..a33cf219c714654e7f1cbf59338fde4f06a382b3 100644 --- a/src/pages/system/view/organization/usermanagement/User.vue +++ b/src/pages/system/view/organization/usermanagement/User.vue @@ -4,12 +4,12 @@
@@ -31,10 +31,10 @@ \ No newline at end of file + diff --git a/src/pages/user/components/info.vue b/src/pages/user/components/info.vue index 96bddb217af715a4af9c8716192c5a8a91f75e05..9bc1b929676844ac2a1deb10b405e4622a65c3a6 100644 --- a/src/pages/user/components/info.vue +++ b/src/pages/user/components/info.vue @@ -25,7 +25,7 @@
@@ -50,6 +50,9 @@ export default { loginId() { return this.$store.state.userInfo.loginId; }, + userAvatar() { + return this.form.userAvatar ? `${this.$fileUrl}${this.form.userAvatar}` : null; + }, }, watch: { '$store.state.userInfo'(userInfo) { diff --git a/src/pages/user/components/todo.vue b/src/pages/user/components/todo.vue index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e29d93ff5fc182411c3d5bae5b06ef566f357624 100644 --- a/src/pages/user/components/todo.vue +++ b/src/pages/user/components/todo.vue @@ -0,0 +1,3 @@ + diff --git a/src/plugins/index.js b/src/plugins/index.js index e9019944a3a6c10346a534c250bdb6fa15ab3a34..7353a29cbcc1724591de9a5e8285685615373c15 100644 --- a/src/plugins/index.js +++ b/src/plugins/index.js @@ -1,7 +1,7 @@ import VueI18nPlugin from './vueI18nPlugin'; import AuthorityPlugin from './authorityPlugin'; import TabsPagePlugin from './tabsPagePlugin'; -import { Table, WhiteCard, Upload } from '@/components'; +import { Table, WhiteCard, Upload, MyFormItem } from '@/components'; const Plugins = { install: function(Vue) { @@ -11,6 +11,7 @@ const Plugins = { Vue.component('my-table', Table); Vue.component('my-card', WhiteCard); Vue.component('my-upload', Upload); + Vue.component('my-form-item', MyFormItem); }, }; export default Plugins; diff --git a/src/router/async/router.map.js b/src/router/async/router.map.js index 2f5823d3d2ea24e8ab51d1b802cec9248796524f..582d129527420c3cb130e68b356227defeb30722 100644 --- a/src/router/async/router.map.js +++ b/src/router/async/router.map.js @@ -54,11 +54,6 @@ const routerMap = { name: '菜单管理', component: () => import('@/pages/system/view/menu'), }, - - // organization_management: { - // name: '组织管理', - // component: () => import('@/pages/system/view/organization'), - // }, user_management: { name: '用户管理', component: () => import('@/pages/system/view/user'), @@ -67,13 +62,10 @@ const routerMap = { name: '角色管理', component: () => import('@/pages/system/view/role'), }, - // parameter_management: { - // name: '参数管理', - // component: () => import('@/pages/system/view/parameter'), + + // log_management: { + // name: '日志管理', + // component: () => import('@/pages/system/view/log'), // }, - log_management: { - name: '日志管理', - component: () => import('@/pages/system/view/log'), - }, }; export default routerMap; diff --git a/src/router/config.js b/src/router/config.js index c846c98cfc3d20c9d3afaff1388e424e19832af1..5e55a7027e87c021f6fdd72c47efc0d63ff547c3 100644 --- a/src/router/config.js +++ b/src/router/config.js @@ -130,6 +130,11 @@ const options = { name: '登录日志', component: () => import('@/pages/system/view/log/login_log/index.vue'), }, + { + path: 'operation_log', + name: '操作日志', + component: () => import('@/pages/system/view/log/operation/index.vue'), + }, ], }, {