From e5e356a94a962ff8cb4b861c18f72ecc734dcb2c Mon Sep 17 00:00:00 2001 From: Mrtangl <1807746833@qq.com> Date: Thu, 14 Apr 2022 16:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/auth.ts | 5 + admin/src/api/setting.ts | 10 +- admin/src/plugins/vue-echarts.ts | 11 +- admin/src/views/permission/admin/index.vue | 16 +- admin/src/views/setting/system/cache.vue | 118 +++++++++--- .../src/views/setting/system/environment.vue | 25 +-- admin/src/views/setting/system/journal.vue | 178 +++++++++--------- admin/src/views/setting/website/filing.vue | 2 + .../src/views/setting/website/information.vue | 17 +- 9 files changed, 228 insertions(+), 154 deletions(-) diff --git a/admin/src/api/auth.ts b/admin/src/api/auth.ts index 74e9281b..2c4af26b 100644 --- a/admin/src/api/auth.ts +++ b/admin/src/api/auth.ts @@ -24,6 +24,11 @@ export function apiAdminDetail(params: any) { return request.get('/system/admin/detail', { params }) } +// 管理员状态 +export function apiAdminStatus(params: any) { + return request.post('/system/admin/disable', params) +} + /* 角色 */ // 角色列表 export function apiRoleLists(params: any) { diff --git a/admin/src/api/setting.ts b/admin/src/api/setting.ts index 101e18c9..d133b4c3 100644 --- a/admin/src/api/setting.ts +++ b/admin/src/api/setting.ts @@ -2,20 +2,20 @@ import request from '@/utils/request' // 获取备案信息 export function apiGetCopyright() { - return request.get('/setting/copyright') + return request.get('/setting/getCopyright') } // 设置备案信息 export function apiSetCopyright(params: any) { - return request.post('/setting/copyright', { ...params }) + return request.post('/setting/setCopyright', { ...params }) } // 获取网站信息 export function apiGetWebsite() { - return request.get('/setting/website') + return request.get('/setting/getWebsite') } // 设置网站信息 export function apiSetWebsite(params: any) { - return request.post('/setting/website', { ...params }) + return request.post('/setting/setWebsite', { ...params }) } // 获取政策协议 @@ -66,7 +66,7 @@ export function apiLoginConfigSet(params: any) { // 获取系统日志列表 export function apiSystemLogLists(params: any) { - return request.get('/setting.system.log/lists', { params }) + return request.get('/system/log/operate', { params }) } // 清除系统缓存 diff --git a/admin/src/plugins/vue-echarts.ts b/admin/src/plugins/vue-echarts.ts index af618d83..ec8c8e81 100644 --- a/admin/src/plugins/vue-echarts.ts +++ b/admin/src/plugins/vue-echarts.ts @@ -4,12 +4,16 @@ import { App } from '@vue/runtime-core' // 手动引入 ECharts 各模块来减小打包体积 import { CanvasRenderer } from 'echarts/renderers' -import { BarChart, PieChart, LineChart } from 'echarts/charts' +import { BarChart, PieChart, LineChart, PieSeriesOption } from 'echarts/charts' +import { LabelLayout } from 'echarts/features' import { GridComponent, TooltipComponent, TitleComponent, - LegendComponent + LegendComponent, + TitleComponentOption, + TooltipComponentOption, + LegendComponentOption } from 'echarts/components' use([ @@ -20,7 +24,8 @@ use([ TooltipComponent, TitleComponent, LegendComponent, - LineChart + LineChart, + LabelLayout ]) export default (app: App) => { diff --git a/admin/src/views/permission/admin/index.vue b/admin/src/views/permission/admin/index.vue index b8d59c77..e31fc2de 100644 --- a/admin/src/views/permission/admin/index.vue +++ b/admin/src/views/permission/admin/index.vue @@ -57,12 +57,12 @@ min-width="100" > - - + diff --git a/admin/src/views/setting/system/environment.vue b/admin/src/views/setting/system/environment.vue index 87a2881d..876db03a 100644 --- a/admin/src/views/setting/system/environment.vue +++ b/admin/src/views/setting/system/environment.vue @@ -7,7 +7,9 @@
- + + +
@@ -16,9 +18,10 @@
内存
- - - + + + +
@@ -40,13 +43,13 @@
Java虚拟机信息
- - - - - - - + + + + + + +
diff --git a/admin/src/views/setting/system/journal.vue b/admin/src/views/setting/system/journal.vue index cccd4321..f99aab97 100644 --- a/admin/src/views/setting/system/journal.vue +++ b/admin/src/views/setting/system/journal.vue @@ -4,11 +4,7 @@ - + @@ -21,29 +17,21 @@ > - - - - - - - - - - - - + + + + + + + + + + + +
@@ -58,14 +46,18 @@
- - - + + + - - - + + + + + + +
@@ -80,70 +72,68 @@ diff --git a/admin/src/views/setting/website/filing.vue b/admin/src/views/setting/website/filing.vue index dd8c8dad..5a6a7cb7 100644 --- a/admin/src/views/setting/website/filing.vue +++ b/admin/src/views/setting/website/filing.vue @@ -99,6 +99,8 @@ export default defineComponent({ // 设置备案信息 const setCopyright = () => { + console.log(formData.privilege, '==') + apiSetCopyright({ privilege: formData.privilege, icpNumber: formData.icpNumber, diff --git a/admin/src/views/setting/website/information.vue b/admin/src/views/setting/website/information.vue index 23a718d6..1787c6fd 100644 --- a/admin/src/views/setting/website/information.vue +++ b/admin/src/views/setting/website/information.vue @@ -18,7 +18,7 @@ show-word-limit > - +
@@ -32,7 +32,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -93,13 +93,10 @@ export default defineComponent({ // 表单验证 const rules = { - name: [ - { - required: true, - message: '请输入网站名称', - trigger: ['blur'] - } - ] + name: [{ required: true, message: '请输入网站名称', trigger: ['blur'] }], + favicon: [{ required: true, message: '上传网站图标', trigger: ['blur'] }], + logo: [{ required: true, message: '上传网站logo', trigger: ['blur'] }], + backdrop: [{ required: true, message: '上传登录页广告图', trigger: ['blur'] }] } // 获取备案信息