diff --git a/config/dev.env.js b/config/dev.env.js index 031402a..0115503 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -5,4 +5,5 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', BASE_API: '"http://localhost:8000"' + // BASE_API: '"https://api.auauz.net"' }) diff --git a/config/index.js b/config/index.js index f70a9d5..9307278 100644 --- a/config/index.js +++ b/config/index.js @@ -1,15 +1,35 @@ 'use strict' // Template version: 1.2.6 -// see http://vuejs-templates.github.io/webpack for documentation. - +const devEnv = require('./dev.env') +// 获取接口地址 +const base_url = devEnv.BASE_API.replace(/"/g,'') const path = require('path') - module.exports = { dev: { // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', - proxyTable: {}, + // 配置代理 + proxyTable: { + '/auth': { + // 测试环境 + target: base_url, + secure: true, + changeOrigin: true, + pathRewrite: { + '^/auth': 'auth' + } + }, + '/api': { + // 测试环境 + target: base_url, + secure: true, + changeOrigin: true, + pathRewrite: { + '^/api': 'api' + } + } + }, // Various Dev Server settings host: 'localhost', // can be overwritten by process.env.HOST @@ -57,7 +77,7 @@ module.exports = { * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: './', /** * Source Maps diff --git a/package.json b/package.json index da1d0e9..66ccd70 100644 --- a/package.json +++ b/package.json @@ -18,14 +18,13 @@ }, "dependencies": { "@riophae/vue-treeselect": "0.0.38", - "axios": ">=0.18.1", + "axios": "^0.19.0", "clipboard": "1.7.1", "codemirror": "^5.38.0", "connect": "3.6.6", "echarts": "4.1.0", - "element-ui": "^2.10.1", + "element-ui": "^2.11.1", "file-saver": "1.3.8", - "html2canvas": "^1.0.0-rc.3", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", "jszip": "3.1.5", @@ -34,10 +33,9 @@ "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "screenfull": "3.3.3", - "simple-drawing-board": "1.4.1", "vue": "2.5.17", "vue-count-to": "1.0.13", - "vue-router": "^3.1.3", + "vue-router": "3.1.3", "vuex": "3.0.1", "wangeditor": ">=3.0.0", "xlsx": "^0.11.16" diff --git a/src/api/localStorage.js b/src/api/localStorage.js index 02293f0..b2e1bdb 100644 --- a/src/api/localStorage.js +++ b/src/api/localStorage.js @@ -15,6 +15,14 @@ export function del(id) { }) } +export function delAll(ids) { + return request({ + url: 'api/localStorage/', + method: 'delete', + data: ids + }) +} + export function edit(data) { return request({ url: 'api/localStorage', diff --git a/src/api/user.js b/src/api/user.js index a928986..49e2777 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,6 +7,13 @@ export function add(data) { data }) } +export function downloadUser() { + return request({ + url: 'api/users/download', + method: 'get', + responseType: 'blob' + }) +} export function del(id) { return request({ diff --git a/src/assets/avatar/avatar.png b/src/assets/avatar/avatar.png new file mode 100644 index 0000000..e16488e Binary files /dev/null and b/src/assets/avatar/avatar.png differ diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 89d967e..96b78dc 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -37,6 +37,9 @@ export default { if (first && first.name !== '首页') { matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched) } + if (matched.length >= 4) { + matched.splice(1, 1) + } this.levelList = matched }, pathCompile(path) { diff --git a/src/config/index.js b/src/config/index.js index 5bf337d..492405f 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -36,7 +36,7 @@ export default { /** * @description 固定头部 */ - fixedHeader: false, + fixedHeader: true, /** * @description 是否显示logo @@ -46,7 +46,7 @@ export default { /** * 是否显示设置的悬浮按钮 */ - settingBtn: true, + settingBtn: false, /** * 是否显示设置的底部信息 diff --git a/src/icons/svg/weixin.svg b/src/icons/svg/weixin.svg new file mode 100644 index 0000000..5d57a61 --- /dev/null +++ b/src/icons/svg/weixin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue index 05f927e..47a6193 100644 --- a/src/layout/Layout.vue +++ b/src/layout/Layout.vue @@ -5,13 +5,6 @@
-
@@ -19,7 +12,6 @@
- @@ -28,7 +20,6 @@ import RightPanel from '@/components/RightPanel' import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components' import ResizeMixin from './mixin/ResizeHandler' import { mapState } from 'vuex' -import feedback from './feedback.vue' export default { name: 'Layout', @@ -38,15 +29,9 @@ export default { Settings, Sidebar, TagsView, - RightPanel, - feedback + RightPanel }, mixins: [ResizeMixin], - data() { - return { - feedbackShow: false - } - }, computed: { ...mapState({ sidebar: state => state.app.sidebar, @@ -66,10 +51,6 @@ export default { methods: { handleClickOutside() { this.$store.dispatch('closeSideBar', { withoutAnimation: false }) - }, - doFeedback() { - console.log(111) - this.feedbackShow = true } } } @@ -118,12 +99,5 @@ export default { .mobile .fixed-header { width: 100%; } - - .feedback { - position: fixed; - z-index: 999999; - right: 10px; - bottom: 60px; - } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ee088a0..db0ed5b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -11,7 +11,7 @@
- +
@@ -46,7 +46,7 @@ import { mapGetters } from 'vuex' import Breadcrumb from '@/components/Breadcrumb' import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' - +import Avatar from '@/assets/avatar/avatar.png' export default { components: { Breadcrumb, @@ -55,6 +55,7 @@ export default { }, data() { return { + Avatar: Avatar, dialogVisible: false } }, @@ -62,7 +63,8 @@ export default { ...mapGetters([ 'sidebar', 'user', - 'device' + 'device', + 'baseApi' ]), show: { get() { diff --git a/src/layout/feedback.vue b/src/layout/feedback.vue deleted file mode 100644 index c3a91ec..0000000 --- a/src/layout/feedback.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - - diff --git a/src/main.js b/src/main.js index 0440705..44dd629 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,6 @@ import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n import mavonEditor from 'mavon-editor' import 'mavon-editor/dist/css/index.css' - import '@/styles/index.scss' // global css import App from './App' @@ -16,11 +15,17 @@ import store from './store' import '@/icons' // icon import './router/index' // permission control +import Router from 'vue-router' Vue.use(mavonEditor) Vue.use(permission) Vue.use(ElementUI, { locale }) Vue.config.productionTip = false + +const routerPush = Router.prototype.push +Router.prototype.push = function push(location) { + return routerPush.call(this, location).catch(error => error) +} require('babel-polyfill') new Vue({ diff --git a/src/utils/index.js b/src/utils/index.js index 2514e9a..d12da2f 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -147,3 +147,15 @@ export function removeClass(ele, cls) { ele.className = ele.className.replace(reg, ' ') } } + +export function downloadFile(obj, name, suffix) { + const url = window.URL.createObjectURL(new Blob([obj])) + const link = document.createElement('a') + link.style.display = 'none' + link.href = url + const fileName = parseTime(new Date()) + '-' + name + '.' + suffix + link.setAttribute('download', fileName) + document.body.appendChild(link) + link.click() + document.body.removeChild(link) +} diff --git a/src/utils/request.js b/src/utils/request.js index 2cf8d2a..b37d2dd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,7 @@ import Config from '@/config' // 创建axios实例 const service = axios.create({ - baseURL: process.env.BASE_API, // api 的 base_url + baseURL: process.env.NODE_ENV === 'production' ? process.env.BASE_API : '/', // api 的 base_url timeout: Config.timeout // 请求超时时间 }) diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue index 543f715..bb9e08a 100644 --- a/src/views/components/Editor.vue +++ b/src/views/components/Editor.vue @@ -17,6 +17,7 @@ import { mapGetters } from 'vuex' import E from 'wangeditor' import { getToken } from '@/utils/auth' export default { + name: 'Editor', data() { return { headers: { diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 75765c4..d15164a 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -6,7 +6,7 @@
-
Daily Pv
+
日流量
@@ -17,7 +17,7 @@
-
Daily Ip
+
日IP量
@@ -28,7 +28,7 @@
-
Weekly Pv
+
周流量
@@ -39,7 +39,7 @@
-
Weekly Ip
+
周IP量
diff --git a/src/views/features/401.vue b/src/views/features/401.vue index 4559180..14b6996 100644 --- a/src/views/features/401.vue +++ b/src/views/features/401.vue @@ -27,7 +27,6 @@ diff --git a/src/views/monitor/redis/index.vue b/src/views/monitor/redis/index.vue index 867d934..7f0766f 100644 --- a/src/views/monitor/redis/index.vue +++ b/src/views/monitor/redis/index.vue @@ -25,7 +25,7 @@ - + diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue index 4771d99..f0fec57 100644 --- a/src/views/nested/menu1/menu1-2/index.vue +++ b/src/views/nested/menu1/menu1-2/index.vue @@ -1,7 +1,5 @@ diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue index 695f6eb..245f395 100644 --- a/src/views/system/dept/form.vue +++ b/src/views/system/dept/form.vue @@ -1,5 +1,5 @@ - +