From c15decdccdb81c719bf8e926204a38f44dcedc00 Mon Sep 17 00:00:00 2001 From: zjl Date: Fri, 30 Aug 2024 10:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=81=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- pnpm-lock.yaml | 35 +++++++++++++++-- .../system/logger/loginLog/querySchemas.ts | 8 ++++ .../system/logger/operLog/querySchemas.ts | 38 +++++++++++-------- 4 files changed, 64 insertions(+), 19 deletions(-) diff --git a/.env.development b/.env.development index 09628d1..023afc4 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VITE_DROP_CONSOLE = true # 跨域代理，可以配置多个，请注意不要换行 #VITE_PROXY = [["/appApi","http://localhost:8001"],["/upload","http://localhost:8001/upload"]] -VITE_PROXY=[["/api","http://192.168.124.203:8081/api"]] +VITE_PROXY=[["/api","http://127.0.0.1:8081/api"]] # API 接口地址 VITE_GLOB_API_URL = diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 414a247..3f351b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@element-plus/icons-vue': specifier: ^2.3.1 version: 2.3.1(vue@3.4.27(typescript@4.9.5)) + '@tinymce/tinymce-vue': + specifier: ^5.1.1 + version: 5.1.1(vue@3.4.27(typescript@4.9.5)) '@vicons/antd': specifier: ^0.12.0 version: 0.12.0 @@ -71,9 +74,15 @@ importers: qs: specifier: ^6.12.1 version: 6.12.1 + tinymce: + specifier: 5.10.3 + version: 5.10.3 vue: specifier: ^3.4.27 version: 3.4.27(typescript@4.9.5) + vue-cropper: + specifier: 0.5.8 + version: 0.5.8 vue-router: specifier: ^4.3.2 version: 4.3.2(vue@3.4.27(typescript@4.9.5)) @@ -744,6 +753,11 @@ packages: '@sxzz/popperjs-es@2.11.7': resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==} + '@tinymce/tinymce-vue@5.1.1': + resolution: {integrity: sha512-iO57HOWesFOhsaqjA5Ea6sDvQBmJJH3/dq00Uvg7metlct2kLF+ctRgoDsetLt6gmeZ7COPftr814/XzqnJ/dg==} + peerDependencies: + vue: ^3.0.0 + '@tsconfig/node10@1.0.11': resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==} @@ -3510,6 +3524,9 @@ packages: through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} + tinymce@5.10.3: + resolution: {integrity: sha512-O59ssHNnujWvSk5Gt8hIGrdNCMKVWVQv9F8siAgLTRgTh0t3NDHrP1UlLtCxArUi9DPWZvlBeUz8D5fJTu7vnA==} + tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -3694,6 +3711,9 @@ packages: terser: optional: true + vue-cropper@0.5.8: + resolution: {integrity: sha512-Xgi/aLQCcNCiBTUdovy/i4LWx0G7fQnAENBpDWA3J4i87Zlk9DJRksXrClsQ6nnaFRfQVkMimij5GEvAMaXdYw==} + vue-demi@0.14.8: resolution: {integrity: sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==} engines: {node: '>=12'} @@ -4123,7 +4143,7 @@ snapshots: '@types/node': 20.5.1 chalk: 4.1.2 cosmiconfig: 8.3.6(typescript@4.9.5) - cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@4.9.5))(ts-node@10.9.2(@types/node@20.5.1)(typescript@4.9.5))(typescript@4.9.5) + cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@4.9.5))(ts-node@10.9.2(@types/node@17.0.45)(typescript@4.9.5))(typescript@4.9.5) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -4403,6 +4423,11 @@ snapshots: '@sxzz/popperjs-es@2.11.7': {} + '@tinymce/tinymce-vue@5.1.1(vue@3.4.27(typescript@4.9.5))': + dependencies: + tinymce: 5.10.3 + vue: 3.4.27(typescript@4.9.5) + '@tsconfig/node10@1.0.11': {} '@tsconfig/node12@1.0.11': {} @@ -5084,11 +5109,11 @@ snapshots: core-js@3.37.1: {} - cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@4.9.5))(ts-node@10.9.2(@types/node@20.5.1)(typescript@4.9.5))(typescript@4.9.5): + cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@4.9.5))(ts-node@10.9.2(@types/node@17.0.45)(typescript@4.9.5))(typescript@4.9.5): dependencies: '@types/node': 20.5.1 cosmiconfig: 8.3.6(typescript@4.9.5) - ts-node: 10.9.2(@types/node@20.5.1)(typescript@4.9.5) + ts-node: 10.9.2(@types/node@17.0.45)(typescript@4.9.5) typescript: 4.9.5 cosmiconfig-typescript-loader@5.0.0(@types/node@17.0.45)(cosmiconfig@9.0.0(typescript@4.9.5))(typescript@4.9.5): @@ -7231,6 +7256,8 @@ snapshots: through@2.3.8: {} + tinymce@5.10.3: {} + tmp@0.0.33: dependencies: os-tmpdir: 1.0.2 @@ -7428,6 +7455,8 @@ snapshots: sass: 1.77.4 terser: 5.31.0 + vue-cropper@0.5.8: {} + vue-demi@0.14.8(vue@3.4.27(typescript@4.9.5)): dependencies: vue: 3.4.27(typescript@4.9.5) diff --git a/src/views/system/logger/loginLog/querySchemas.ts b/src/views/system/logger/loginLog/querySchemas.ts index 42cb50e..95e8029 100644 --- a/src/views/system/logger/loginLog/querySchemas.ts +++ b/src/views/system/logger/loginLog/querySchemas.ts @@ -1,5 +1,13 @@ import { FormSchema } from '@/components/Form/index'; export const schemas: FormSchema[] = [ + { + field: 'username', + component: 'Input', + label: '操作用户', + componentProps: { + placeholder: '请输入操作用户', + }, + }, { field: 'type', component: 'Select', diff --git a/src/views/system/logger/operLog/querySchemas.ts b/src/views/system/logger/operLog/querySchemas.ts index 42cb50e..03131f6 100644 --- a/src/views/system/logger/operLog/querySchemas.ts +++ b/src/views/system/logger/operLog/querySchemas.ts @@ -1,24 +1,32 @@ import { FormSchema } from '@/components/Form/index'; export const schemas: FormSchema[] = [ { - field: 'type', - component: 'Select', - label: '请求类型', + field: 'title', + component: 'Input', + label: '日志标题', componentProps: { - placeholder: '请选择请求类型', - clearable:true, - options: [ - { - label: '登录', - value: '0', - }, - { - label: '退出', - value: '1', - }, - ], + placeholder: '请输入日志标题', }, }, + // { + // field: 'type', + // component: 'Select', + // label: '请求类型', + // componentProps: { + // placeholder: '请选择请求类型', + // clearable:true, + // options: [ + // { + // label: '登录', + // value: '0', + // }, + // { + // label: '退出', + // value: '1', + // }, + // ], + // }, + // }, { field: 'status', component: 'Select',