diff --git a/README.md b/README.md index 0419cc6..872cc0e 100644 --- a/README.md +++ b/README.md @@ -416,16 +416,15 @@ pnpm run build:pro ## 移动端演示图 -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077811740.jpg) - -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077826257.jpg) - -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077835024.jpg) - -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077849753.jpg) - -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077860987.jpg) - -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077870240.jpg) - -![image-20221010214526082](https://gitee.com/ktianc/kinit/raw/master/images/uni/1670077878132.jpg) \ No newline at end of file + + + + + + + + + + + +
\ No newline at end of file diff --git a/kinit-admin/package.json b/kinit-admin/package.json index ca6568b..0a3db25 100644 --- a/kinit-admin/package.json +++ b/kinit-admin/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "1.8.6", + "version": "1.8.7", "description": "一套基于vue3、element-plus、typesScript、vite3的后台集成方案。", "author": "Archer <502431556@qq.com>", "private": false, @@ -34,6 +34,7 @@ "animate.css": "^4.1.1", "axios": "^1.1.3", "clipboard": "^2.0.11", + "consola": "^2.15.3", "echarts": "^5.4.0", "echarts-wordcloud": "^2.0.0", "element-plus": "2.2.21", @@ -47,6 +48,7 @@ "pinia-plugin-persist": "^1.0.0", "qrcode": "^1.5.1", "qs": "^6.11.0", + "terser": "^5.16.1", "url": "^0.11.0", "vue": "3.2.45", "vue-i18n": "9.2.2", @@ -97,8 +99,8 @@ "typescript": "4.9.3", "unplugin-vue-macros": "^0.16.3", "vite": "3.2.4", + "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", - "vite-plugin-html": "^3.2.0", "vite-plugin-mock": "^2.9.6", "vite-plugin-purge-icons": "^0.9.1", "vite-plugin-style-import": "2.0.0", diff --git a/kinit-admin/src/views/vadmin/system/record/login/components/Detail.vue b/kinit-admin/src/views/vadmin/system/record/login/components/Detail.vue index fdf891b..0364812 100644 --- a/kinit-admin/src/views/vadmin/system/record/login/components/Detail.vue +++ b/kinit-admin/src/views/vadmin/system/record/login/components/Detail.vue @@ -1,11 +1,13 @@ diff --git a/kinit-admin/src/views/vadmin/system/record/login/components/login.data.ts b/kinit-admin/src/views/vadmin/system/record/login/components/login.data.ts index 2b96124..f11e97e 100644 --- a/kinit-admin/src/views/vadmin/system/record/login/components/login.data.ts +++ b/kinit-admin/src/views/vadmin/system/record/login/components/login.data.ts @@ -28,7 +28,7 @@ export const columns = reactive([ }, { field: 'platform', - label: '登陆平台', + label: '登录平台', width: '150px', show: true, span: 24 @@ -42,7 +42,7 @@ export const columns = reactive([ }, { field: 'ip', - label: '登陆地址', + label: '登录地址', show: true, disabled: true, width: '150px', @@ -50,7 +50,7 @@ export const columns = reactive([ }, { field: 'address', - label: '登陆地点', + label: '登录地点', show: true, span: 24 }, @@ -101,10 +101,10 @@ export const columns = reactive([ }, { field: 'action', - width: '150px', label: '操作', show: true, - disabled: true, + disabled: false, + width: '100px', span: 24 } ]) @@ -121,9 +121,20 @@ export const searchSchema = reactive([ } } }, + { + field: 'platform', + label: '登录平台', + component: 'Select', + componentProps: { + style: { + width: '214px' + }, + options: [] + } + }, { field: 'ip', - label: '登陆地址', + label: '登录地址', component: 'Input', componentProps: { clearable: false, @@ -134,7 +145,7 @@ export const searchSchema = reactive([ }, { field: 'address', - label: '登陆地点', + label: '登录地点', component: 'Input', componentProps: { clearable: false, @@ -153,11 +164,11 @@ export const searchSchema = reactive([ }, options: [ { - label: '登陆成功', + label: '登录成功', value: true }, { - label: '登陆失败', + label: '登录失败', value: false } ] diff --git a/kinit-admin/src/views/vadmin/system/record/login/index.vue b/kinit-admin/src/views/vadmin/system/record/login/index.vue index 70ad60e..cc8ccc1 100644 --- a/kinit-admin/src/views/vadmin/system/record/login/index.vue +++ b/kinit-admin/src/views/vadmin/system/record/login/index.vue @@ -12,6 +12,7 @@ import Detail from './components/Detail.vue' import { Search } from '@/components/Search' import { selectDictLabel, DictDetail } from '@/utils/dict' import { useDictStore } from '@/store/modules/dict' +import { FormSetPropsType } from '@/types/form' const { register, elTableRef, tableObject, methods } = useTable({ getListApi: getRecordLoginListApi, @@ -29,12 +30,18 @@ const dialogVisible = ref(false) const dialogTitle = ref('') const platformOptions = ref([]) const loginMethodOptions = ref([]) +const searchSetSchemaList = ref([] as FormSetPropsType[]) const getOptions = async () => { const dictStore = useDictStore() const dictOptions = await dictStore.getDictObj(['sys_vadmin_platform', 'sys_vadmin_login_method']) platformOptions.value = dictOptions.sys_vadmin_platform loginMethodOptions.value = dictOptions.sys_vadmin_login_method + searchSetSchemaList.value.push({ + field: 'platform', + path: 'componentProps.options', + value: dictOptions.sys_vadmin_platform + }) } getOptions() @@ -69,7 +76,12 @@ getList()