From 30695f01ca7c6459c934ce9440f6e1d4da5046b8 Mon Sep 17 00:00:00 2001 From: yoe Date: Wed, 13 May 2020 10:52:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=99=BB=E5=BD=95=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 12 ++---- package-lock.json | 37 +++++++++++++++++++ src/App.vue | 1 - src/api/api_menu.js | 2 +- src/api/api_sys.js | 28 +++++++------- src/api/api_user.js | 8 ++-- src/element/index.js | 1 - src/{element => }/icons/iconfont.js | 0 src/{element => }/icons/index.js | 0 src/{element => }/icons/svg/icon-admin.svg | 0 src/{element => }/icons/svg/icon-bianji.svg | 0 src/{element => }/icons/svg/icon-config.svg | 0 .../icons/svg/icon-dangdifill.svg | 0 src/{element => }/icons/svg/icon-daohang.svg | 0 src/{element => }/icons/svg/icon-duanxin.svg | 0 src/{element => }/icons/svg/icon-editor.svg | 0 src/{element => }/icons/svg/icon-geren.svg | 0 src/{element => }/icons/svg/icon-jiesuo.svg | 0 src/{element => }/icons/svg/icon-job.svg | 0 src/{element => }/icons/svg/icon-log.svg | 0 src/{element => }/icons/svg/icon-menu.svg | 0 src/{element => }/icons/svg/icon-mudedi.svg | 0 src/{element => }/icons/svg/icon-oss.svg | 0 src/{element => }/icons/svg/icon-pinglun.svg | 0 src/{element => }/icons/svg/icon-role.svg | 0 src/{element => }/icons/svg/icon-shanchu.svg | 0 src/{element => }/icons/svg/icon-shezhi.svg | 0 src/{element => }/icons/svg/icon-shoucang.svg | 0 .../icons/svg/icon-shoucangfill.svg | 0 src/{element => }/icons/svg/icon-shouye.svg | 0 src/{element => }/icons/svg/icon-sousuo.svg | 0 src/{element => }/icons/svg/icon-sql.svg | 0 src/{element => }/icons/svg/icon-suoding.svg | 0 src/{element => }/icons/svg/icon-system.svg | 0 src/{element => }/icons/svg/icon-tixing.svg | 0 src/{element => }/icons/svg/icon-tubiao.svg | 0 src/{element => }/icons/svg/icon-xiangqu.svg | 0 .../icons/svg/icon-xiangqufill.svg | 0 src/{element => }/icons/svg/icon-zhedie.svg | 0 src/{element => }/icons/svg/icon-zonghe.svg | 0 .../compoments/staff-manage-right/index.vue | 3 +- .../business/staff/staff-profile/index.vue | 4 +- src/views/common/login.vue | 12 ++---- src/views/layout/main-sidebar.vue | 24 ------------ src/views/modules/sys/menu-add-or-update.vue | 2 +- src/views/modules/sys/menu.vue | 10 ++--- src/views/modules/sys/user-add-or-update.vue | 2 +- static/.gitkeep | 0 48 files changed, 74 insertions(+), 72 deletions(-) rename src/{element => }/icons/iconfont.js (100%) rename src/{element => }/icons/index.js (100%) rename src/{element => }/icons/svg/icon-admin.svg (100%) rename src/{element => }/icons/svg/icon-bianji.svg (100%) rename src/{element => }/icons/svg/icon-config.svg (100%) rename src/{element => }/icons/svg/icon-dangdifill.svg (100%) rename src/{element => }/icons/svg/icon-daohang.svg (100%) rename src/{element => }/icons/svg/icon-duanxin.svg (100%) rename src/{element => }/icons/svg/icon-editor.svg (100%) rename src/{element => }/icons/svg/icon-geren.svg (100%) rename src/{element => }/icons/svg/icon-jiesuo.svg (100%) rename src/{element => }/icons/svg/icon-job.svg (100%) rename src/{element => }/icons/svg/icon-log.svg (100%) rename src/{element => }/icons/svg/icon-menu.svg (100%) rename src/{element => }/icons/svg/icon-mudedi.svg (100%) rename src/{element => }/icons/svg/icon-oss.svg (100%) rename src/{element => }/icons/svg/icon-pinglun.svg (100%) rename src/{element => }/icons/svg/icon-role.svg (100%) rename src/{element => }/icons/svg/icon-shanchu.svg (100%) rename src/{element => }/icons/svg/icon-shezhi.svg (100%) rename src/{element => }/icons/svg/icon-shoucang.svg (100%) rename src/{element => }/icons/svg/icon-shoucangfill.svg (100%) rename src/{element => }/icons/svg/icon-shouye.svg (100%) rename src/{element => }/icons/svg/icon-sousuo.svg (100%) rename src/{element => }/icons/svg/icon-sql.svg (100%) rename src/{element => }/icons/svg/icon-suoding.svg (100%) rename src/{element => }/icons/svg/icon-system.svg (100%) rename src/{element => }/icons/svg/icon-tixing.svg (100%) rename src/{element => }/icons/svg/icon-tubiao.svg (100%) rename src/{element => }/icons/svg/icon-xiangqu.svg (100%) rename src/{element => }/icons/svg/icon-xiangqufill.svg (100%) rename src/{element => }/icons/svg/icon-zhedie.svg (100%) rename src/{element => }/icons/svg/icon-zonghe.svg (100%) create mode 100644 static/.gitkeep diff --git a/config/index.js b/config/index.js index d01af5c..11be9a3 100644 --- a/config/index.js +++ b/config/index.js @@ -8,20 +8,14 @@ const IP = require('ip').address() module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', proxyTable: { - '/renren-fast-server': { - target: 'http://demo.open.renren.io', + '/lz_management': { + target: 'https://tlzmanagement.ldxinyong.com', changeOrigin: true - }, - '/sys': { - // target: 'http://demo.open.renren.io', - target: 'http://10.0.1.180:8001', - changeOrigin: true - }, + } }, // Various Dev Server settings diff --git a/package-lock.json b/package-lock.json index 3813dbc..ed4e86f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3835,6 +3835,21 @@ "zrender": "4.3.0" } }, + "echarts-amap": { + "version": "1.0.0-rc.6", + "resolved": "https://registry.npmjs.org/echarts-amap/-/echarts-amap-1.0.0-rc.6.tgz", + "integrity": "sha1-V4KnTa7lLtRM4/j2JXdWF4PwnhY=" + }, + "echarts-liquidfill": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/echarts-liquidfill/-/echarts-liquidfill-2.0.5.tgz", + "integrity": "sha512-3G19W5ngoh1L3BXYuD34g0Vd30ORWvQtyxRuL+7vmOZ3FkF6xkgD4pfcCL7QVAQOr+XZ4OiD2ot6dNGsRhflcg==" + }, + "echarts-wordcloud": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz", + "integrity": "sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg==" + }, "editorconfig": { "version": "0.15.3", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", @@ -13691,6 +13706,11 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, + "numerify": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/numerify/-/numerify-1.2.9.tgz", + "integrity": "sha512-X4QzQiytV5ZN3TVLhzbtFzjTarUNnaa1pgNDFqt7u7Nqhxe7FvY2eYrGt4WYHlYXDqgtfC/n/a5nJ2y0LijV8w==" + }, "nwmatcher": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz", @@ -18402,6 +18422,11 @@ "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", "dev": true }, + "utils-lite": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/utils-lite/-/utils-lite-0.1.10.tgz", + "integrity": "sha512-jlHvdtI8MyWURF/3u+ufIjf1Cs5WjN6WZl9qO8dEkZsVjaI7X5YMUhaCFzkvB69ljt6fo4Dd7V/Oj2NJOFDFOQ==" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -18413,6 +18438,18 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, + "v-charts": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/v-charts/-/v-charts-1.19.0.tgz", + "integrity": "sha512-vm2HBUmxAsXK0ivwce9LytcpqrItDA5JSPLYVxZXtiuoyhcn80XX1/3dPJd/1GqG1OYv3jfBo1s9ra4q8GowqA==", + "requires": { + "echarts-amap": "1.0.0-rc.6", + "echarts-liquidfill": "^2.0.2", + "echarts-wordcloud": "^1.1.3", + "numerify": "1.2.9", + "utils-lite": "0.1.10" + } + }, "v8flags": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", diff --git a/src/App.vue b/src/App.vue index d97ce8f..6b43a48 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,6 @@ diff --git a/src/api/api_menu.js b/src/api/api_menu.js index d6a11c1..9494b2a 100644 --- a/src/api/api_menu.js +++ b/src/api/api_menu.js @@ -2,5 +2,5 @@ import http from '../utils/http' // 获取侧边菜单栏 export const apiGetMenuNav = params => { - return http({ url: '/renren-fast-server/sys/menu/nav', method: 'get', params }) + return http({ url: '/lz_management/sys/menu/nav', method: 'get', params }) } diff --git a/src/api/api_sys.js b/src/api/api_sys.js index 1bb0ab1..3dcdbc0 100644 --- a/src/api/api_sys.js +++ b/src/api/api_sys.js @@ -5,27 +5,27 @@ import http from '../utils/http' */ // 获取管理员列表 export const apiSysUserList = params => { - return http({ url: '/renren-fast-server/sys/user/list', method: 'get', params }) + return http({ url: '/lz_management/sys/user/list', method: 'get', params }) } // 获取角色选择列表 export const apiSysRoleSelect = params => { - return http({ url: '/renren-fast-server/sys/role/select', method: 'get', params }) + return http({ url: '/lz_management/sys/role/select', method: 'get', params }) } // 用户编辑 export const apiSysUserInfo = (params, id) => { - return http({ url: `/renren-fast-server/sys/user/info${id}`, method: 'get', params }) + return http({ url: `/lz_management/sys/user/info${id}`, method: 'get', params }) } // 提交（用户） export const apiSysUserConfirm = (data, type) => { - return http({ url: `/renren-fast-server/sys/user${type}`, method: 'post', data }) + return http({ url: `/lz_management/sys/user${type}`, method: 'post', data }) } // 删除用户 export const apiSysUserDelete = (data, type) => { - return http({ url: `/renren-fast-server/sys/user/delete`, method: 'post', data }) + return http({ url: `/lz_management/sys/user/delete`, method: 'post', data }) } /** @@ -33,22 +33,22 @@ export const apiSysUserDelete = (data, type) => { */ // 角色管理列表 export const apiSysRoleList = params => { - return http({ url: '/renren-fast-server/sys/role/list', method: 'get', params }) + return http({ url: '/lz_management/sys/role/list', method: 'get', params }) } // 角色编辑 export const apiSysRoleInfo = (params, id) => { - return http({ url: `/renren-fast-server/sys/role/info${id}`, method: 'get', params }) + return http({ url: `/lz_management/sys/role/info${id}`, method: 'get', params }) } // 角色提交 export const apiSysRoleConfirm = (data, type) => { - return http({ url: `/renren-fast-server/sys/role${type}`, method: 'post', data }) + return http({ url: `/lz_management/sys/role${type}`, method: 'post', data }) } // 删除角色 export const apiSysRoleDelete = (data, type) => { - return http({ url: `/renren-fast-server/sys/role/delete`, method: 'post', data }) + return http({ url: `/lz_management/sys/role/delete`, method: 'post', data }) } /** @@ -56,25 +56,25 @@ export const apiSysRoleDelete = (data, type) => { */ // 菜单管理列表 export const apiSysMenuList = params => { - return http({ url: '/renren-fast-server/sys/menu/list', method: 'get', params }) + return http({ url: '/lz_management/sys/menu/list', method: 'get', params }) } // 获取菜单选择列表 export const apiSysMenuSelect = params => { - return http({ url: '/renren-fast-server/sys/menu/select', method: 'get', params }) + return http({ url: '/lz_management/sys/menu/select', method: 'get', params }) } // 菜单编辑 export const apiSysMenuInfo = (params, id) => { - return http({ url: `/renren-fast-server/sys/menu/info${id}`, method: 'get', params }) + return http({ url: `/lz_management/sys/menu/info${id}`, method: 'get', params }) } // 菜单提交 export const apiSysMenuConfirm = (data, type) => { - return http({ url: `/renren-fast-server/sys/menu${type}`, method: 'post', data }) + return http({ url: `/lz_management/sys/menu${type}`, method: 'post', data }) } // 删除菜单 export const apiSysMenuDelete = (params, id) => { - return http({ url: `/renren-fast-server/sys/menu/delete/${id}`, method: 'get', params }) + return http({ url: `/lz_management/sys/menu/delete/${id}`, method: 'get', params }) } diff --git a/src/api/api_user.js b/src/api/api_user.js index 58154b9..174c66c 100644 --- a/src/api/api_user.js +++ b/src/api/api_user.js @@ -2,20 +2,20 @@ import http from '../utils/http' // 登录 export const apiLogin = data => { - return http({ url: '/renren-fast-server/sys/login', method: 'post', data }) + return http({ url: '/lz_management/sys/login', method: 'post', data }) } // 退出登录 export const apiLogout = data => { - return http({ url: '/renren-fast-server/sys/logout', method: 'post', data }) + return http({ url: '/lz_management/sys/logout', method: 'post', data }) } // 修改密码 export const apiSysUserPassword = data => { - return http({ url: '/renren-fast-server/sys/user/password', method: 'post', data }) + return http({ url: '/lz_management/sys/user/password', method: 'post', data }) } // 获取用户相关 export const apiGetUserInfo = (params, id) => { - return http({ url: `/renren-fast-server/sys/user/info${id}`, method: 'get', params }) + return http({ url: `/lz_management/sys/user/info${id}`, method: 'get', params }) } diff --git a/src/element/index.js b/src/element/index.js index ee86eb4..9a2b4f2 100644 --- a/src/element/index.js +++ b/src/element/index.js @@ -1,3 +1,2 @@ import '../element/element-ui' import '../element/element-ui-theme' -import '../element/icons' diff --git a/src/element/icons/iconfont.js b/src/icons/iconfont.js similarity index 100% rename from src/element/icons/iconfont.js rename to src/icons/iconfont.js diff --git a/src/element/icons/index.js b/src/icons/index.js similarity index 100% rename from src/element/icons/index.js rename to src/icons/index.js diff --git a/src/element/icons/svg/icon-admin.svg b/src/icons/svg/icon-admin.svg similarity index 100% rename from src/element/icons/svg/icon-admin.svg rename to src/icons/svg/icon-admin.svg diff --git a/src/element/icons/svg/icon-bianji.svg b/src/icons/svg/icon-bianji.svg similarity index 100% rename from src/element/icons/svg/icon-bianji.svg rename to src/icons/svg/icon-bianji.svg diff --git a/src/element/icons/svg/icon-config.svg b/src/icons/svg/icon-config.svg similarity index 100% rename from src/element/icons/svg/icon-config.svg rename to src/icons/svg/icon-config.svg diff --git a/src/element/icons/svg/icon-dangdifill.svg b/src/icons/svg/icon-dangdifill.svg similarity index 100% rename from src/element/icons/svg/icon-dangdifill.svg rename to src/icons/svg/icon-dangdifill.svg diff --git a/src/element/icons/svg/icon-daohang.svg b/src/icons/svg/icon-daohang.svg similarity index 100% rename from src/element/icons/svg/icon-daohang.svg rename to src/icons/svg/icon-daohang.svg diff --git a/src/element/icons/svg/icon-duanxin.svg b/src/icons/svg/icon-duanxin.svg similarity index 100% rename from src/element/icons/svg/icon-duanxin.svg rename to src/icons/svg/icon-duanxin.svg diff --git a/src/element/icons/svg/icon-editor.svg b/src/icons/svg/icon-editor.svg similarity index 100% rename from src/element/icons/svg/icon-editor.svg rename to src/icons/svg/icon-editor.svg diff --git a/src/element/icons/svg/icon-geren.svg b/src/icons/svg/icon-geren.svg similarity index 100% rename from src/element/icons/svg/icon-geren.svg rename to src/icons/svg/icon-geren.svg diff --git a/src/element/icons/svg/icon-jiesuo.svg b/src/icons/svg/icon-jiesuo.svg similarity index 100% rename from src/element/icons/svg/icon-jiesuo.svg rename to src/icons/svg/icon-jiesuo.svg diff --git a/src/element/icons/svg/icon-job.svg b/src/icons/svg/icon-job.svg similarity index 100% rename from src/element/icons/svg/icon-job.svg rename to src/icons/svg/icon-job.svg diff --git a/src/element/icons/svg/icon-log.svg b/src/icons/svg/icon-log.svg similarity index 100% rename from src/element/icons/svg/icon-log.svg rename to src/icons/svg/icon-log.svg diff --git a/src/element/icons/svg/icon-menu.svg b/src/icons/svg/icon-menu.svg similarity index 100% rename from src/element/icons/svg/icon-menu.svg rename to src/icons/svg/icon-menu.svg diff --git a/src/element/icons/svg/icon-mudedi.svg b/src/icons/svg/icon-mudedi.svg similarity index 100% rename from src/element/icons/svg/icon-mudedi.svg rename to src/icons/svg/icon-mudedi.svg diff --git a/src/element/icons/svg/icon-oss.svg b/src/icons/svg/icon-oss.svg similarity index 100% rename from src/element/icons/svg/icon-oss.svg rename to src/icons/svg/icon-oss.svg diff --git a/src/element/icons/svg/icon-pinglun.svg b/src/icons/svg/icon-pinglun.svg similarity index 100% rename from src/element/icons/svg/icon-pinglun.svg rename to src/icons/svg/icon-pinglun.svg diff --git a/src/element/icons/svg/icon-role.svg b/src/icons/svg/icon-role.svg similarity index 100% rename from src/element/icons/svg/icon-role.svg rename to src/icons/svg/icon-role.svg diff --git a/src/element/icons/svg/icon-shanchu.svg b/src/icons/svg/icon-shanchu.svg similarity index 100% rename from src/element/icons/svg/icon-shanchu.svg rename to src/icons/svg/icon-shanchu.svg diff --git a/src/element/icons/svg/icon-shezhi.svg b/src/icons/svg/icon-shezhi.svg similarity index 100% rename from src/element/icons/svg/icon-shezhi.svg rename to src/icons/svg/icon-shezhi.svg diff --git a/src/element/icons/svg/icon-shoucang.svg b/src/icons/svg/icon-shoucang.svg similarity index 100% rename from src/element/icons/svg/icon-shoucang.svg rename to src/icons/svg/icon-shoucang.svg diff --git a/src/element/icons/svg/icon-shoucangfill.svg b/src/icons/svg/icon-shoucangfill.svg similarity index 100% rename from src/element/icons/svg/icon-shoucangfill.svg rename to src/icons/svg/icon-shoucangfill.svg diff --git a/src/element/icons/svg/icon-shouye.svg b/src/icons/svg/icon-shouye.svg similarity index 100% rename from src/element/icons/svg/icon-shouye.svg rename to src/icons/svg/icon-shouye.svg diff --git a/src/element/icons/svg/icon-sousuo.svg b/src/icons/svg/icon-sousuo.svg similarity index 100% rename from src/element/icons/svg/icon-sousuo.svg rename to src/icons/svg/icon-sousuo.svg diff --git a/src/element/icons/svg/icon-sql.svg b/src/icons/svg/icon-sql.svg similarity index 100% rename from src/element/icons/svg/icon-sql.svg rename to src/icons/svg/icon-sql.svg diff --git a/src/element/icons/svg/icon-suoding.svg b/src/icons/svg/icon-suoding.svg similarity index 100% rename from src/element/icons/svg/icon-suoding.svg rename to src/icons/svg/icon-suoding.svg diff --git a/src/element/icons/svg/icon-system.svg b/src/icons/svg/icon-system.svg similarity index 100% rename from src/element/icons/svg/icon-system.svg rename to src/icons/svg/icon-system.svg diff --git a/src/element/icons/svg/icon-tixing.svg b/src/icons/svg/icon-tixing.svg similarity index 100% rename from src/element/icons/svg/icon-tixing.svg rename to src/icons/svg/icon-tixing.svg diff --git a/src/element/icons/svg/icon-tubiao.svg b/src/icons/svg/icon-tubiao.svg similarity index 100% rename from src/element/icons/svg/icon-tubiao.svg rename to src/icons/svg/icon-tubiao.svg diff --git a/src/element/icons/svg/icon-xiangqu.svg b/src/icons/svg/icon-xiangqu.svg similarity index 100% rename from src/element/icons/svg/icon-xiangqu.svg rename to src/icons/svg/icon-xiangqu.svg diff --git a/src/element/icons/svg/icon-xiangqufill.svg b/src/icons/svg/icon-xiangqufill.svg similarity index 100% rename from src/element/icons/svg/icon-xiangqufill.svg rename to src/icons/svg/icon-xiangqufill.svg diff --git a/src/element/icons/svg/icon-zhedie.svg b/src/icons/svg/icon-zhedie.svg similarity index 100% rename from src/element/icons/svg/icon-zhedie.svg rename to src/icons/svg/icon-zhedie.svg diff --git a/src/element/icons/svg/icon-zonghe.svg b/src/icons/svg/icon-zonghe.svg similarity index 100% rename from src/element/icons/svg/icon-zonghe.svg rename to src/icons/svg/icon-zonghe.svg diff --git a/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue b/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue index f010625..4f2559a 100644 --- a/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue +++ b/src/views/business/staff/staff-manage/compoments/staff-manage-right/index.vue @@ -74,7 +74,8 @@