hjq/PixelAI-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://129.211.33.98:3210/hjq/mart-admin

Browse Source
This commit is contained in:
Soutfairy 2024-11-18 18:03:05 +08:00
commit d72abc8bd4
12 changed files with 385 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/App.vue
View File

@ -20,6 +20,7 @@ import other from '/@/utils/other';
import { Local, Session } from '/@/utils/storage';
import mittBus from '/@/utils/mitt';
import setIntroduction from '/@/utils/setIconfont';
import logoMini from '/@/assets/logo-mini.svg';
// 引入组件
const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
@ -59,6 +60,14 @@ const getGlobalComponentSize = computed(() => {
const getGlobalI18n = computed(() => {
return messages.value[locale.value];
});
// 动态设置网站图标
let link: any = document.querySelector("link[rel*='icon']") || document.createElement("link");
link.type = "image/x-icon";
link.rel = "shortcut icon";
link.href = themeConfig.value.logoMini||logoMini;
document.getElementsByTagName("head")[0].appendChild(link);
// 设置初始化，防止刷新时恢复默认
onBeforeMount(() => {
// 设置批量第三方 icon 图标

24
src/api/log/index.ts Normal file
View File

@ -0,0 +1,24 @@
import request from '/@/utils/request';
import { baseUrlHost } from '../baseUrlHost';
/**
* （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
* 注意在写get请求时，参数是params，而不是data，要标注好
*
* 登录api接口集合
* @method getlogList 获取日志列表
*/
export function logApi() {
return {
getlogList: (params: object) => {
// console.log(1111111111111111);
return request({
url: baseUrlHost + '/acLog',
method: 'get',
params,
});
},
};
}

5
src/i18n/lang/en.ts
View File

@ -14,6 +14,7 @@ export default {
articleDetail: 'articleDetail',
addArticle: 'addArticle',
editArticle: 'editArticle',
log:'log',
limits: 'limits',
limitsFrontEnd: 'FrontEnd',
limitsFrontEndPage: 'FrontEndPage',
@ -171,6 +172,10 @@ export default {
fourIsDark: 'Dark Mode',
fourIsWartermark: 'Turn on watermark',
fourWartermarkText: 'Watermark copy',
logoTitle: 'Logo title',
footTitle: 'Foot title',
footTip: 'Foot tip',
logoSetting: 'Logo setting',
fiveTitle: 'Other settings',
fiveTagsStyle: 'Tagsview style',
fiveAnimation: 'page animation',

5
src/i18n/lang/zh-cn.ts
View File

@ -14,6 +14,7 @@ export default {
articleDetail: '文章详情',
addArticle: '新增文章',
editArticle: '编辑文章',
log:'系统日志',
limits: '权限管理',
limitsFrontEnd: '前端控制',
limitsFrontEndPage: '页面权限',
@ -171,6 +172,10 @@ export default {
fourIsDark: '深色模式',
fourIsWartermark: '开启水印',
fourWartermarkText: '水印文案',
logoTitle: 'Logo名称',
footTitle: '页脚版权说明',
logoSetting: 'Logo设置',
footTip: '页脚Tip',
fiveTitle: '其它设置',
fiveTagsStyle: 'Tagsview 风格',
fiveAnimation: '主页面切换动画',

5
src/i18n/lang/zh-tw.ts
View File

@ -14,6 +14,7 @@ export default {
articleDetail: '文章詳情',
addArticle: '文章新增',
editArticle: '文章編輯',
log:'系統日誌',
limits: '許可權管理',
limitsFrontEnd: '前端控制',
limitsFrontEndPage: '頁面許可權',
@ -171,6 +172,10 @@ export default {
fourIsDark: '深色模式',
fourIsWartermark: '開啟浮水印',
fourWartermarkText: '浮水印文案',
logoTitle: 'Logo 標題',
footTitle: '頁腳版權說明',
footTip: '頁腳tip',
logoSetting: 'Logo 配置',
fiveTitle: '其它設定',
fiveTagsStyle: 'Tagsview 風格',
fiveAnimation: '主頁面切換動畫',

11
src/layout/footer/index.vue
View File

@ -1,14 +1,19 @@
<template>
<div class="layout-footer pb15">
<div class="layout-footer-warp">
<div>vue-next-admin，Made by lyt with ❤️</div>
<div class="mt5">深圳市 xxx 公司版权所有</div>
<div>{{ themeConfig.globalFootTipMsg }}</div>
<div class="mt5">{{ themeConfig.globalFootTitleMsg }}</div>
</div>
</div>
</template>
<script setup lang="ts" name="layoutFooter">
// 此处需有内容（注释也得），否则缓存将失败
import { storeToRefs } from 'pinia';
import { useThemeConfig } from '/@/stores/themeConfig';
// 定义变量内容
const storesThemeConfig = useThemeConfig();
const { themeConfig } = storeToRefs(storesThemeConfig);
</script>
<style scoped lang="scss">

4
src/layout/logo/index.vue
View File

@ -1,10 +1,10 @@
<template>
<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
<img :src="logoMini" class="layout-logo-medium-img" />
<img :src="themeConfig.logoMini||logoMini" class="layout-logo-medium-img" />
<span>{{ themeConfig.globalTitle }}</span>
</div>
<div class="layout-logo-size" v-else @click="onThemeConfigChange">
<img :src="logoMini" class="layout-logo-size-img" />
<img :src="themeConfig.logoMini||logoMini" class="layout-logo-size-img" />
</div>
</template>

117
src/layout/navBars/topBar/setings.vue
View File

@ -285,6 +285,35 @@
<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput"></el-input>
</div>
</div>
<div class="layout-breadcrumb-seting-bar-flex mt14">
<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.logoTitle') }}</div>
<div class="layout-breadcrumb-seting-bar-flex-value">
<el-input v-model="getThemeConfig.globalTitle" size="default" style="width: 90px" @input="onWartermarkTitleInput"></el-input>
</div>
</div>
<div class="layout-breadcrumb-seting-bar-flex mt14">
<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.footTitle') }}</div>
<div class="layout-breadcrumb-seting-bar-flex-value">
<el-input v-model="getThemeConfig.globalFootTitleMsg" size="default" style="width: 90px" @input="onWartermarkFootTitleInput"></el-input>
</div>
</div>
<div class="layout-breadcrumb-seting-bar-flex mt14">
<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.footTip') }}</div>
<div class="layout-breadcrumb-seting-bar-flex-value">
<el-input v-model="getThemeConfig.globalFootTipMsg" size="default" style="width: 90px" @input="onWartermarkFootTipInput"></el-input>
</div>
</div>
<div class="layout-breadcrumb-seting-bar-flex mt14">
<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.logoSetting') }}</div>
<div class="layout-breadcrumb-seting-bar-flex-value">
<el-upload ref="uploadRef" action="#" :limit="1" :auto-upload="false" @change="onWartermarkLogoUpload" :on-preview="handlePreview"
:file-list="getThemeConfig.logoMini?[{name:getThemeConfig.globalTitle,url:getThemeConfig.logoMini}]:[]" accept='image/*' :on-remove="handleRemove">
<template #default>
<el-button v-if="!getThemeConfig.logoMini" class="logo-picture" type="text">上传文件</el-button>
</template>
</el-upload>
</div>
</div>
<!-- 其它设置 -->
<el-divider content-position="left">{{ $t('message.layout.fiveTitle') }}</el-divider>
@ -426,12 +455,15 @@
</div>
</el-scrollbar>
</el-drawer>
<el-dialog v-model="dialogVisible">
<img w-full :src="getThemeConfig.logoMini" alt="预览logo" />
</el-dialog>
</div>
</template>
<script setup lang="ts" name="layoutBreadcrumbSeting">
import { nextTick, onUnmounted, onMounted, computed, reactive } from 'vue';
import { ElMessage } from 'element-plus';
import { nextTick, onUnmounted, onMounted, computed, reactive, ref } from 'vue';
import { ElMessage, UploadFile, UploadFiles, UploadProps } from 'element-plus';
import { useI18n } from 'vue-i18n';
import { storeToRefs } from 'pinia';
import { useThemeConfig } from '/@/stores/themeConfig';
@ -442,6 +474,8 @@ import Watermark from '/@/utils/watermark';
import commonFunction from '/@/utils/commonFunction';
import other from '/@/utils/other';
import mittBus from '/@/utils/mitt';
import { articleApi } from '/@/api/article';
import logoMini from '/@/assets/logo-mini.svg';
// 定义变量内容
const { locale } = useI18n();
@ -453,6 +487,9 @@ const state = reactive({
isMobile: false,
});
// 引入 api 请求接口
const artApi = articleApi();
// 获取布局配置信息
const getThemeConfig = computed(() => {
return themeConfig.value;
@ -577,7 +614,71 @@ const onWartermarkTextInput = (val: string) => {
if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText);
setLocalThemeConfig();
};
// 5、布局切换
// 5、界面显示 --> logo标题
const onWartermarkTitleInput = (val: string) => {
getThemeConfig.value.globalTitle = verifyAndSpace(val);
if (getThemeConfig.value.globalTitle === '') return false;
if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.globalTitle);
other.useTitle();
setLocalThemeConfig();
};
// 6、界面显示 --> 页脚tip
const onWartermarkFootTitleInput = (val: string) => {
getThemeConfig.value.globalFootTitleMsg = verifyAndSpace(val);
if (getThemeConfig.value.globalFootTitleMsg === '') return false;
if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.globalFootTitleMsg);
setLocalThemeConfig();
};
// 7、界面显示 --> 页脚版权
const onWartermarkFootTipInput = (val: string) => {
getThemeConfig.value.globalFootTipMsg = verifyAndSpace(val);
if (getThemeConfig.value.globalFootTipMsg === '') return false;
if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.globalFootTipMsg);
setLocalThemeConfig();
};
const uploadRef = ref();
const dialogVisible = ref(false);
const handlePreview: UploadProps['onPreview'] = (uploadFile) =>{
dialogVisible.value = true;
};
const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
// onWartermarkLogoMiniInput('/src/assets/logo-mini.svg');
onWartermarkLogoMiniInput('');
uploadRef.value.clearFiles();
}
// 封面基本路径
const viteUrl = import.meta.env.VITE_API_URL;
// 8、界面显示 --> logo设置
const onWartermarkLogoMiniInput = (val: string) => {
getThemeConfig.value.logoMini = verifyAndSpace(val);
// if (getThemeConfig.value.logoMini === '') return false;
if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.logoMini);
// 设置网站图标
let link: any = document.querySelector("link[rel*='icon']") || document.createElement("link");
link.type = "image/x-icon";
link.rel = "shortcut icon";
link.href = themeConfig.value.logoMini||logoMini;
document.getElementsByTagName("head")[0].appendChild(link);
setLocalThemeConfig();
};
// 8、界面显示 --> logo上传
const onWartermarkLogoUpload = async (uploadFile: UploadFile, uploadFiles: UploadFiles) => {
if(uploadFile.raw?.type.includes('image')){
const file:any = uploadFile.raw;
const formdata = new FormData();
formdata.append('file', file);
let res = await artApi.uploadFile(formdata);
if(res?.success&&res?.data){
onWartermarkLogoMiniInput(encodeURI(viteUrl+res.data.path));
}else{
ElMessage.error('logo上传失败！');
}
}else{
ElMessage.error('请上传图片文件！');
uploadRef.value.clearFiles();
}
}
// 9、布局切换
const onSetLayout = (layout: string) => {
Local.set('oldLayout', layout);
if (getThemeConfig.value.layout === layout) return false;
@ -823,4 +924,14 @@ defineExpose({
}
}
}
.logo-picture{
display: flex;
align-items: center;
justify-content: center;
padding: 8px 15px 0;
}
:deep(.el-upload-list__item){
margin-top: -20px;
width: 100px;
}
</style>

15
src/router/route.ts
View File

@ -232,6 +232,21 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
icon: 'iconfont icon-fuwenbenkuang',
},
},
{
path: '/log',
name: 'log',
component: () => import('/@/views/log/index.vue'),
meta: {
title: 'message.router.log',
isLink: '',
isHide: false,
isKeepAlive: true,
isAffix: false,
isIframe: false,
roles: ['admin', 'common'],
icon: 'fa fa-wpforms',
},
},
{
path: '/order',
name: 'order',

6
src/stores/themeConfig.ts
View File

@ -105,6 +105,10 @@ export const useThemeConfig = defineStore('themeConfig', {
isWartermark: true,
// 水印文案
wartermarkText: 'vue-next-admin',
// 页脚版权信息内容
globalFootTitleMsg: '深圳市 xxx 公司版权所有',
// 页脚tip
globalFootTipMsg: 'vue-next-admin，Made by lyt with ❤️',
/**
* 其它设置
@ -146,6 +150,8 @@ export const useThemeConfig = defineStore('themeConfig', {
globalI18n: 'zh-cn',
// 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large'
globalComponentSize: 'large',
// 网站logo
logoMini: '/@/assets/logo-mini.svg',
},
}),
actions: {

3
src/types/pinia.d.ts vendored
View File

@ -77,6 +77,8 @@ declare interface ThemeConfigState {
isIsDark: boolean;
isWartermark: boolean;
wartermarkText: string;
globalFootTitleMsg: string;
globalFootTipMsg: string;
tagsStyle: string;
animation: string;
columnsAsideStyle: string;
@ -88,5 +90,6 @@ declare interface ThemeConfigState {
globalViceTitleMsg: string;
globalI18n: string;
globalComponentSize: string;
logoMini: string;
};
}

189
src/views/log/index.vue Normal file
View File

@ -0,0 +1,189 @@
<template>
<div class="system-dept-container layout-padding">
<el-card shadow="hover" class="layout-padding-auto">
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%" :header-cell-style="{ backgroundColor: '#fafafa', height: '40px' }">
<el-table-column prop="username" label="账号" width="100"/>
<el-table-column prop="usergroupName" label="操作人角色" show-overflow-tooltip></el-table-column>
<el-table-column prop="action" label="操作对应方法" show-overflow-tooltip></el-table-column>
<el-table-column prop="description" label="操作描述" show-overflow-tooltip></el-table-column>
<el-table-column prop="acresult" label="操作结果" :formatter="typeFormatter" show-overflow-tooltip></el-table-column>
<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
</el-table>
<el-pagination
@size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
:pager-count="5"
:page-sizes="[10, 20, 30]"
v-model:current-page="state.tableData.param.current"
background
v-model:page-size="state.tableData.param.size"
layout="total, sizes, prev, pager, next, jumper"
:total="state.tableData.total"
>
</el-pagination>
</el-card>
<!-- <DeptDialog ref="deptDialogRef" @refresh="getTableData()" /> -->
</div>
</template>
<script setup lang="ts" name="logIndex">
import { onMounted, reactive, ref } from 'vue';
import { logApi } from '/@/api/log';
import { ElMessage, ElMessageBox, TableColumnCtx } from 'element-plus';
import { useRouter } from 'vue-router';
const router = useRouter();
// 表格数据
const state = reactive({
tableData: {
data: [],
total: 0,
loading: false,
param: {
current: 1,
size: 10,
},
},
});
// // 模块列表
// const moduleList = ref([]);
// // 标签列表
// const labelList = ref([]);
// 引入 api 请求接口
const syslogApi = logApi();
// 获取表格数据
const getTableData = async() => {
try {
state.tableData.loading = true;
console.log(111111111111111);
let res = await syslogApi.getlogList(state.tableData.param);
if(res?.success){
state.tableData.data = res.data.records;
state.tableData.total = res.data.total;
}else{
ElMessage.error('文章列表获取失败！');
}
} catch (error) {
} finally {
state.tableData.loading = false;
}
};
// // 模块选择
// const handleChangeModule = async(val: any) => {
// try {
// state.tableData.param.labelName = '';
// if(!val){labelList.value=[]; return;}
// const op:any = event?.currentTarget;
// let res = await artApi.getLabelList(op.dataset.op);
// if(res?.success){
// labelList.value = res.data;
// }else{
// ElMessage.error('标签列表获取失败！');
// }
// } catch (error) {
// ElMessage.error('标签列表获取失败！');
// } finally {
// }
// }
// // 重置
// const reset = () =>{
// state.tableData.param = {
// labelName: '',
// moduleName: '',
// title: '',
// current: 1,
// size: 10,
// }
// getTableData();
// }
// // 添加文章
// const toAddArticle = () => {
// router.push({ path: '/article/add' });
// }
// // 添加文章
// const toEditArticle = (row: any) => {
// router.push({ path: '/article/edit', query: { id:row.id, moduleName: row.moduleName, labelName: row.labelName } });
// }
// // 文章详情
// const toShowDetail = (row: any) => {
// router.push({ path: '/article/detail' , query: { id:row.id, moduleName: row.moduleName, labelName: row.labelName } });
// }
// // 文章删除
// const deleteArticle = (id: number) => {
// ElMessageBox.confirm('确定要删除该文章吗?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning',
// })
// .then(async() => {
// try {
// state.tableData.loading = true;
// let res = await artApi.deleteArticle(id);
// if(res?.success){
// await getTableData();
// ElMessage.success('文章删除成功！');
// } else ElMessage.error('文章删除失败！');
// } catch(e) {
// ElMessage.error('处理失败！');
// } finally {
// state.tableData.loading = false;
// }
// })
// }
// 日期格式化
const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
let date = new Date(row.createtime);
return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
}
// // 文章类型格式化
// const typeFormatter = (row: any, column: TableColumnCtx<String>) => {
// return row.articletype === 1 ? '外链' : '图文';
// }
// 分页改变
const onHandleSizeChange = (val: number) => {
state.tableData.param.size = val;
getTableData();
};
// 分页改变
const onHandleCurrentChange = (val: number) => {
state.tableData.param.current = val;
getTableData();
};
onMounted(() => {
getTableData();
})
</script>
<style scoped lang="scss">
.system-dept-container {
:deep(.el-card__body) {
display: flex;
flex-direction: column;
flex: 1;
overflow: auto;
.el-table {
flex: 1;
}
}
}
</style>