Compare commits

...

12 Commits

Author SHA1 Message Date
夕阳微笑1
2f110d5e8d 角色管理的修改 2024-12-16 13:45:55 +08:00
夕阳微笑1
430553412c 登录页以及个人中心修改 2024-12-16 13:45:03 +08:00
夕阳微笑1
ca02a903ce 图片管理样式修改 2024-12-16 13:44:38 +08:00
夕阳微笑1
91f4cd1487 标签管理修改 2024-12-16 13:44:16 +08:00
夕阳微笑1
3ad716ba12 轮播图样式修改 2024-12-16 13:44:01 +08:00
夕阳微笑1
027772c637 默认头像更改 2024-12-16 13:43:49 +08:00
夕阳微笑1
c206a82e52 登录页和首页更改 2024-12-16 13:43:07 +08:00
夕阳微笑1
71164b0cd5 用户角色管理接口新增 2024-12-16 13:42:39 +08:00
夕阳微笑1
b525a67a09 标签管理接口修改 2024-12-16 13:42:24 +08:00
夕阳微笑1
e3478d84bb 头像资源 2024-12-16 13:42:09 +08:00
夕阳微笑1
29db490914 首页的一些修改 2024-12-16 13:41:56 +08:00
夕阳微笑1
d0207e5a08 图片下载 2024-12-16 13:41:43 +08:00
16 changed files with 495 additions and 216 deletions

View File

@ -50,14 +50,16 @@ const getVersion = computed(() => {
// @ts-ignore
if ((Local.get('version') && Local.get('version') !== __NEXT_VERSION__) || !Local.get('version')) isVersion = true;
}
return isVersion;
// return isVersion;
return false;
});
// 广
const hideSponsors = computed(() => {
const path = route.path;
console.log(path === '/login' || path === '/article/content');
return path === '/login' || path === '/article/content';
// return path === '/login' || path === '/article/content';
return true;
});
//
const getGlobalComponentSize = computed(() => {

23
src/api/download/index.ts Normal file
View File

@ -0,0 +1,23 @@
import axios from "axios";
const downloadPhoto = (imgSrc:any) => {
axios({
url: imgSrc,
method: 'get',
headers: { 'Content-Type': 'application/json' },
responseType: 'blob',
}).then(res => {
const url = window.URL.createObjectURL(res.data);
const a = document.createElement('a');
a.href = url;
a.download = '下载图片.jpg';
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
window.URL.revokeObjectURL(url);
}).catch(error => {
console.error('Download error:', error);
});
};
export { downloadPhoto };

View File

@ -26,6 +26,13 @@ export function labelApi() {
return request({
url: baseUrlHost + '/cpLabel',
method: 'get',
params,
});
},
getLabelListAll: (params: object) => {
return request({
url: baseUrlHost + '/cpLabel/all',
method: 'get',
params,
});
},

51
src/api/role/index.ts Normal file
View File

@ -0,0 +1,51 @@
import request from '/@/utils/request';
import { baseUrlHost } from '../baseUrlHost';
/**
* request.post(xxx) post params data
* get请求时paramsdata
*
* api接口集合
* @method getRoleList
* @method deleteRole
* @method saveRole
* @method updateRole
* @method getRoleDetail
*/
export function RoleApi() {
return {
getRoleList: () => {
return request({
url: baseUrlHost + '/acGroup',
method: 'get',
});
},
deleteRole: (id: Number) => {
return request({
url: baseUrlHost + `/acGroup/${id}`,
method: 'delete',
});
},
getRoleDetail: (id: Number) => {
return request({
url: baseUrlHost + `/acGroup/${id}`,
method: 'get',
});
},
saveRole: (data: object) => {
return request({
url: baseUrlHost + '/acGroup',
method: 'post',
data,
})
},
updateRole: (data: object) => {
return request({
url: baseUrlHost + '/acGroup',
method: 'put',
data,
})
},
};
}

BIN
src/assets/图片2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 KiB

BIN
src/assets/头像.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

View File

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

View File

@ -1,6 +1,6 @@
<template>
<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
<div class="layout-navbars-breadcrumb-user-icon">
<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
</div>
@ -11,8 +11,8 @@
<el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
</el-dropdown> -->
<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
<div class="layout-navbars-breadcrumb-user-icon">
<i
class="iconfont"
@ -27,22 +27,22 @@
<el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
</el-dropdown> -->
<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
<el-icon :title="$t('message.user.title2')">
<ele-Search />
</el-icon>
</div>
<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
</div> -->
<!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
</div>
<div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">
</div> -->
<!-- <div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">
<el-badge :is-dot="true">
<el-icon :title="$t('message.user.title4')">
<ele-Bell />
</el-icon>
</el-badge>
</div>
</div> -->
<el-popover
ref="userNewsRef"
:virtual-ref="userNewsBadgeRef"

View File

@ -1,6 +1,8 @@
import { defineStore } from 'pinia';
import Cookies from 'js-cookie';
import { Session } from '/@/utils/storage';
import admin from '/@/assets/图片2.png';
import user from '/@/assets/头像.png';
/**
*
@ -52,13 +54,16 @@ export const useUserInfo = defineStore('userInfo', {
defaultRoles = testRoles;
defaultAuthBtnList = testAuthBtnList;
}
// 图片基本路径
// const viteUrl = import.meta.env.VITE_API_URL;
// 用户信息模拟数据
const userInfos = {
userName: userName,
photo:
userName === 'admin'
? 'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500'
: 'https://img2.baidu.com/it/u=2370931438,70387529&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
? admin
: user,
time: new Date().getTime(),
roles: defaultRoles,
authBtnList: defaultAuthBtnList,

View File

@ -1,7 +1,7 @@
<template>
<div class="system-dept-container layout-padding">
<el-card shadow="hover" class="layout-padding-auto">
<div class="system-dept-search mb15">
<!-- <div class="system-dept-search mb15">
<span>名称:</span>
<el-input size="default" placeholder="请输入" v-model="state.tableData.param.name" class="ml10" style="max-width: 250px;margin-right: 20px;"> </el-input>
<el-button @click="getTableData" size="default" type="primary" class="ml10" style="margin-right: 15px;">
@ -15,30 +15,51 @@
<ele-RefreshRight />
</el-icon>
重置
</el-button>
<el-button @click="switchDrawer(0)" size="default" type="primary" class="ml10">
</el-button> -->
<!-- <el-button @click="switchDrawer(0)" size="default" type="primary" class="ml10">
<el-icon>
<ele-FolderAdd />
</el-icon>
新增轮播图
</el-button>
</div>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
<el-table-column prop="name" label="轮播图名称" show-overflow-tooltip width="350px"></el-table-column>
<el-table-column label="跳转链接" show-overflow-tooltip width="350px" align="center">
</el-button> -->
<!-- </div> -->
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%;" class="custom-table">
<el-table-column prop="name" label="轮播图名称" show-overflow-tooltip width="210px"></el-table-column>
<el-table-column label="素材" width="350px" align="center">
<template #default="scope">
<a :href="jpgFormatter(scope.row)">{{ jpgFormatter(scope.row) }}</a>
<el-image :src="encodeURI(viteUrl+scope.row.path)" />
<!-- <a :href="jpgFormatter(scope.row)">{{ jpgFormatter(scope.row) }}</a> -->
<!-- <el-button @click="jpgJump(scope.row)" text type="primary">{{ jpgFormatter(scope.row) }}</el-button> -->
</template>
</el-table-column>
<el-table-column prop="orderNum" label="排序号" sortable show-overflow-tooltip width="350px" align="center"></el-table-column>
<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip width="350px" align="center"></el-table-column>
<el-table-column label="跳转地址" show-overflow-tooltip width="350px" align="center">
<template #default="scope">
<!-- <a :href="jpgFormatter(scope.row)">{{ jpgFormatter(scope.row) }}</a> -->
<el-button @click="jpgJump(scope.row)" text type="primary">{{ scope.row.url }}</el-button>
</template>
</el-table-column>
<el-table-column prop="orderNum" label="排序号" sortable show-overflow-tooltip width="150px" align="center"></el-table-column>
<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip width="250px" align="center"></el-table-column>
<el-table-column label="操作" width="300" align="center">
<template #default="scope">
<el-button size="small" text type="primary" @click="switchDrawer(scope.row.id,1)">编辑</el-button>
<el-button size="small" text type="primary" @click="deleteBanner(scope.row.id)">删除</el-button>
<el-button size="small" text type="primary" @click="switchDrawer(scope.row.id,1)">
<el-icon>
<ele-EditPen/>
</el-icon>
</el-button>
<el-button size="small" text type="primary" @click="deleteBanner(scope.row.id)">
<el-icon>
<ele-Delete/>
</el-icon>
</el-button>
</template>
</el-table-column>
</el-table>
<div class="add-banner" @click="switchDrawer(0)">
+ 添加banner
</div>
<!-- 新增或编辑弹窗 -->
<el-drawer
v-model="dialog"
@ -92,8 +113,8 @@
<img :src="dialogImageUrl" style="width: 100%" alt="Preview Image" />
</el-dialog>
</el-form-item>
<el-form-item label="跳转链接:" prop="path">
<el-input v-model="state.formData.path" />
<el-form-item label="跳转链接:" prop="url">
<el-input v-model="state.formData.url" />
</el-form-item>
<el-form-item label="排序号:" prop="orderNum">
<el-input v-model.number="state.formData.orderNum" />
@ -108,7 +129,7 @@
</div>
</el-drawer>
<!-- 分页器 -->
<el-pagination
<!-- <el-pagination
@size-change="onHandleSizeChange"
@current-change="onHandleCurrentChange"
class="mt15"
@ -120,7 +141,7 @@
layout="total, sizes, prev, pager, next, jumper"
:total="state.tableData.total"
>
</el-pagination>
</el-pagination> -->
</el-card>
</div>
</template>
@ -152,6 +173,7 @@ const state = reactive({
fileList: [],
name:"",
path:"",
url: '',
orderNum: "",
loading: false
},
@ -193,18 +215,20 @@ const getTableData = async() => {
};
//
const reset = () =>{
state.tableData.param = {
name: '',
current: 1,
size: 10,
}
getTableData();
}
// const reset = () =>{
// state.tableData.param = {
// name: '',
// current: 1,
// size: 10,
// }
// getTableData();
// }
//
const viteUrl = import.meta.env.VITE_API_URL;
//
const jpgFormatter = (row: any) => {
console.log("44444444444",row);
@ -221,7 +245,26 @@ const jpgFormatter = (row: any) => {
newPath = newPath.includes('http://localhost:8888/') ? newPath : viteUrl + newPath
console.log("22222222222222222",newPath);
return `${newPath}`;
}
// window.open(newPath);
};
//
const jpgJump = (row:any) =>{
// console.log("44444444444",row);
// let newPath;
// if (row?.data) {
// newPath = row.data.path.replaceAll('\\', '/')
// console.log("11111111111",newPath);
// } else {
// newPath = row.path.replaceAll('\\\\', '/')
// console.log("333333333333",newPath);
// }
// newPath = newPath.includes('http://localhost:8888/') ? newPath : viteUrl + newPath
// console.log("22222222222222222",newPath);
window.open(row.url);
};
//
const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
@ -230,16 +273,16 @@ const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
}
//
const onHandleSizeChange = (val: number) => {
state.tableData.param.size = val;
getTableData();
};
// const onHandleSizeChange = (val: number) => {
// state.tableData.param.size = val;
// getTableData();
// };
//
const onHandleCurrentChange = (val: number) => {
state.tableData.param.current = val;
getTableData();
};
// //
// const onHandleCurrentChange = (val: number) => {
// state.tableData.param.current = val;
// getTableData();
// };
// #endregion
// #region
@ -297,8 +340,8 @@ const handleChange: UploadProps['onChange'] = async (file: uploadFile, uploadFil
console.log("result", res);
console.log("state.formData", state.formData);
if(res?.success){
state.formData.url = jpgFormatter(res);
state.formData.path = jpgFormatter(res);
// state.formData.url = jpgFormatter(res);
state.formData.path = res.data.path;
ElMessage({
message: '图片上传成功!',
type: 'success',
@ -454,17 +497,73 @@ onMounted(() => {
</script>
<style scoped lang="scss">
.add-banner {
width: 100%; //
margin: 16px 0;
text-align: center;
color: #409eff;
cursor: pointer;
font-size: 16px;
display: flex;
align-items: center;
justify-content: center;
height: 100px; //
border: 2px dashed #dcdfe6;
border-radius: 8px;
}
.system-dept-container {
:deep(.el-card__body) {
display: flex;
flex-direction: column;
flex: 1;
overflow: auto;
overflow-y: auto;
max-height: 1000px; //
padding: 20px;
.el-table {
flex: 1;
width: 100%;
table-layout: fixed; //
}
// .el-table th, .el-table td {
// text-align: center;
// padding: 12px 8px;
// word-break: break-all;
// }
}
};
::v-deep .el-image {
width: 250px; //
height: 150px; //
object-fit: cover; //
display: block;
}
img[alt="加载失败"] {
content: url('path_to_placeholder_image.png'); //
width: 250px; //
height: 100px;
}
::v-deep .el-table__body{
width: 100% !important;
}
::v-deep .el-table__body-wrapper .el-table__row {
margin-bottom: 10px; //
border: 1px solid #dcdfe6; // 使
border-radius: 8px; //
box-shadow: 0 4px 15px rgba(0, 0, 0, 0.15); //
background-color: #fff;
overflow: hidden; //
}
::v-deep .el-drawer .el-drawer__header {
margin: 15px 0 20px 0!important;
border-bottom: 0!important;

View File

@ -18,6 +18,23 @@
添加标签
</el-button>
</div>
<!-- <el-tree
:data="treeData"
:props="defaultProps"
node-key="id"
default-expand-all
:highlight-current="true"
@node-click="handleNodeClick"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.name }}</span>
<span>
<el-button size="mini" type="text" @click="toShowDetail(data.id)">查看详情</el-button>
<el-button size="mini" type="text" @click="toEditArticle(data.id)">编辑</el-button>
<el-button size="mini" type="text" @click="deleteArticle(data.id)">删除</el-button>
</span>
</span>
</el-tree> -->
<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="moduleName" label="模块名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="parentName" label="父标签" show-overflow-tooltip></el-table-column>
@ -72,6 +89,11 @@ const addLabelDialogRef = ref();
const editLabelDialog = defineAsyncComponent(() => import('/@/views/label/editDialog.vue'));
const editLabelDialogRef = ref();
interface Tree {
label: string
children?: Tree[]
}
//
const state = reactive({
tableData: {
@ -93,6 +115,13 @@ const moduleList = ref([]);
//
const labelList = ref([]);
//
const treeData = ref([]);
const defaultProps = {
children: 'children',
label: 'name'
};
// api
const labelapi = labelApi();
@ -119,6 +148,7 @@ const getTableData = async() => {
if(res?.success){
state.tableData.data = res.data.records;
state.tableData.total = res.data.total;
buildTreeData();
}else{
ElMessage.error('标签列表获取失败!');
}
@ -128,6 +158,27 @@ const getTableData = async() => {
}
};
const buildTreeData = () => {
const moduleMap = {};
//
state.tableData.data.forEach(item => {
if (!moduleMap[item.moduleName]) {
moduleMap[item.moduleName] = {
name: item.moduleName,
children: []
};
}
moduleMap[item.moduleName].children.push({ ...item });
});
treeData.value = Object.values(moduleMap);
console.log(treeData.value); //
};
const handleNodeClick = (data: Tree) => {
console.log(data)
}
//
const handleChangeModule = async(val: any) => {
@ -147,24 +198,6 @@ const handleChangeModule = async(val: any) => {
}
};
// //
// const handleChangeModule = async(val) => {
// try {
// if (!val) {
// labelList.value = [];
// state.tableData.data = [];
// state.tableData.total = 0;
// return;
// }
// const op = moduleList.value.find(item => item.moduleName === val);
// if (op) {
// state.tableData.param.moduleid = op.id;
// await getTableData();
// }
// } catch (error) {
// ElMessage.error('');
// }
// }
//
const reset = (index = 0) =>{
@ -250,63 +283,6 @@ onMounted(() => {
getTableData();
});
// const totalData = ref([]); //
// //
// const getModuleList = async () => {
// try {
// let res = await labelapi.getModuleList();
// if (res?.success) {
// moduleList.value = res.data;
// await getAllData(); //
// } else {
// ElMessage.error('');
// }
// } catch (error) {
// ElMessage.error('');
// }
// };
// //
// const getAllData = async () => {
// try {
// const requests = moduleList.value.map(module => labelapi.getLabelList({ moduleid: module.id, current: 1, size: 10 })); //
// const results = await Promise.all(requests);
// totalData.value = results
// .filter(res => res?.success) //
// .flatMap(res => res.data.records || []); //
// state.tableData.total = totalData.value.length;
// updatePageData(); //
// } catch (error) {
// ElMessage.error('');
// } finally {
// state.tableData.loading = false;
// }
// };
// //
// const updatePageData = () => {
// const start = (state.tableData.param.current - 1) * state.tableData.param.size;
// const end = start + state.tableData.param.size;
// state.tableData.data = totalData.value.slice(start, end);
// };
// //
// const onHandleSizeChange = (val) => {
// state.tableData.param.size = val;
// updatePageData(); //
// };
// const onHandleCurrentChange = (val) => {
// state.tableData.param.current = val;
// updatePageData(); //
// };
// onMounted(() => {
// getModuleList();
// });
</script>
@ -317,7 +293,7 @@ onMounted(() => {
flex-direction: column;
flex: 1;
overflow: auto;
.el-table {
.el-tree {
flex: 1;
}
}

View File

@ -1,13 +1,13 @@
<template>
<div class="login-container flex">
<div class="login-left">
<div class="login-left-logo">
<!-- <div class="login-left-logo">
<img :src="logoMini" />
<div class="login-left-logo-text">
<span>{{ getThemeConfig.globalViceTitle }}</span>
<span>{{ getThemeConfig.globalTitle }}</span>
<span class="login-left-logo-text-msg">{{ getThemeConfig.globalViceTitleMsg }}</span>
</div>
</div>
</div> -->
<div class="login-left-img">
<img :src="loginMain" />
</div>
@ -18,7 +18,7 @@
<span class="login-right-warp-one"></span>
<span class="login-right-warp-two"></span>
<div class="login-right-warp-mian">
<div class="login-right-warp-main-title">{{ getThemeConfig.globalTitle }} 欢迎您</div>
<div class="login-right-warp-main-title">{{ getThemeConfig.globalTitle }}</div>
<div class="login-right-warp-main-form">
<div v-if="!state.isScan">
<el-tabs v-model="state.tabsActiveName">
@ -30,11 +30,11 @@
</el-tab-pane>
</el-tabs>
</div>
<Scan v-if="state.isScan" />
<!-- <Scan v-if="state.isScan" />
<div class="login-content-main-sacn" @click="state.isScan = !state.isScan">
<i class="iconfont" :class="state.isScan ? 'icon-diannao1' : 'icon-barcode-qr'"></i>
<div class="login-content-main-sacn-delta"></div>
</div>
</div> -->
</div>
</div>
</div>

View File

@ -7,7 +7,7 @@
<div class="personal-user">
<div class="personal-user-left">
<el-upload class="h100 personal-user-left-upload" action="https://jsonplaceholder.typicode.com/posts/" multiple :limit="1">
<img src="https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500" />
<img src="../../assets/图片2.png" />
</el-upload>
</div>
<div class="personal-user-right">
@ -206,6 +206,8 @@ const state = reactive<PersonalState>({
const currentTime = computed(() => {
return formatAxis(new Date());
});
//
const viteUrl = import.meta.env.VITE_API_URL;
</script>
<style scoped lang="scss">

View File

@ -43,16 +43,40 @@
</div>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
<el-table-column type="selection" width="55" />
<el-table-column prop="name" label="图片名称" show-overflow-tooltip width="250px"></el-table-column>
<el-table-column prop="moduleName" label="模块" show-overflow-tooltip width="250px" align="center"></el-table-column>
<el-table-column prop="labelName" label="标签" show-overflow-tooltip width="250px" align="center"></el-table-column>
<el-table-column prop="uploadName" label="上传者" show-overflow-tooltip width="250px" align="center"></el-table-column>
<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip width="350px" align="center"></el-table-column>
<el-table-column label="操作" width="300" align="center">
<el-table-column prop="name" label="图片名称" show-overflow-tooltip width="180px"></el-table-column>
<el-table-column label="素材" width="300px" align="center">
<template #default="scope">
<el-button size="small" text type="primary" @click="switchDrawer(2,scope.row.id)">查看</el-button>
<el-button size="small" text type="primary" @click="switchDrawer(1,scope.row.id)">编辑</el-button>
<el-button size="small" text type="primary" @click="deleteBanner(scope.row.id)">删除</el-button>
<el-image :src="jpgFormatter(scope.row)" />
<!-- <a :href="jpgFormatter(scope.row)">{{ jpgFormatter(scope.row) }}</a> -->
<!-- <el-button @click="jpgJump(scope.row)" text type="primary">{{ jpgFormatter(scope.row) }}</el-button> -->
</template>
</el-table-column>
<el-table-column prop="moduleName" label="模块" show-overflow-tooltip width="200px" align="center"></el-table-column>
<el-table-column prop="labelName" label="标签" show-overflow-tooltip width="200px" align="center"></el-table-column>
<el-table-column prop="uploadName" label="上传者" show-overflow-tooltip width="200px" align="center"></el-table-column>
<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip width="200px" align="center"></el-table-column>
<el-table-column label="操作" width="250" align="center">
<template #default="scope">
<el-button text type="primary" @click="switchDrawer(2,scope.row.id)">
<el-icon>
<ele-View />
</el-icon>
</el-button>
<el-button text type="primary" @click="switchDrawer(1,scope.row.id)">
<el-icon>
<ele-Edit />
</el-icon>
</el-button>
<el-button text type="primary" @click="download(scope.row)">
<el-icon>
<ele-Download />
</el-icon>
</el-button>
<el-button text type="primary" @click="deleteBanner(scope.row.id)">
<el-icon>
<ele-Delete />
</el-icon>
</el-button>
</template>
</el-table-column>
</el-table>
@ -70,7 +94,7 @@
style="max-width: 85%"
:model="state.formData"
:rules="state.rules"
label-width="100px"
label-width="110px"
class="demo-ruleForm"
:size="formSize"
status-icon
@ -164,6 +188,7 @@ import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue'
import type { ComponentSize, FormInstance, FormRules, UploadFile, UploadProps, UploadUserFile } from 'element-plus'
import { baseUrlHost } from '../../api/baseUrlHost';
import { photosApi } from '/@/api/photos';
import { downloadPhoto } from '../../api/download';
const router = useRouter();
@ -280,19 +305,19 @@ const viteUrl = import.meta.env.VITE_API_URL;
//
const jpgFormatter = (row: any) => {
console.log("44444444444",row);
// console.log("44444444444",row);
let newPath;
if (row?.data) {
newPath = row.data.path.replaceAll('\\', '/')
console.log("11111111111",newPath);
// console.log("11111111111",newPath);
} else {
newPath = row.path.replaceAll('\\\\', '/')
console.log("333333333333",newPath);
// console.log("333333333333",newPath);
}
newPath = newPath.includes('http://8.138.171.103/') ? newPath : 'http://8.138.171.103/' + newPath
console.log("22222222222222222",newPath);
// console.log("22222222222222222",newPath);
return `${newPath}`;
}
@ -431,7 +456,39 @@ const handleRemove = (file: UploadFile, uploadFiles) => {
state.formData.path = "";
uploadDisabled.value = false;
};
//
const download = async(row:any) =>{
state.formData.loading = true;
// console.log("44444444444",row);
let newPath;
if (row?.data) {
newPath = row.data.path.replaceAll('\\', '/')
// console.log("11111111111",newPath);
} else {
newPath = row.path.replaceAll('\\\\', '/')
// console.log("333333333333",newPath);
}
newPath = newPath.includes('http://localhost:8888/') ? newPath : viteUrl + newPath
// console.log("22222222222222222",newPath);
try{
await downloadPhoto(newPath);
ElMessage({
message: '图片下载成功!',
type: 'success',
});
}catch(error){
console.error(error);
ElMessage.error('图片下载失败!')
}finally{
state.formData.loading = false;
}
};
//
const deleteBanner = (id: number) => {
ElMessageBox.confirm('确定要删除该图片吗?', '提示', {
@ -537,7 +594,15 @@ onMounted(() => {
flex: 1;
}
}
};
::v-deep .el-image {
width: 250px; //
height: 150px; //
object-fit: cover; //
display: block;
}
::v-deep .el-drawer .el-drawer__header {
margin: 15px 0 20px 0!important;
border-bottom: 0!important;

View File

@ -5,7 +5,7 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="角色名称">
<el-input v-model="state.ruleForm.roleName" placeholder="请输入角色名称" clearable></el-input>
<el-input v-model="state.ruleForm.name" placeholder="请输入角色名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@ -15,22 +15,22 @@
<span>角色标识</span>
</el-tooltip>
</template>
<el-input v-model="state.ruleForm.roleSign" placeholder="请输入角色标识" clearable></el-input>
<el-input v-model="state.ruleForm.acgroup" placeholder="请输入角色标识" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="排序">
<el-input-number v-model="state.ruleForm.sort" :min="0" :max="999" controls-position="right" placeholder="请输入排序" class="w100" />
<el-input-number v-model="state.ruleForm.id" :min="0" :max="999" controls-position="right" placeholder="请输入排序" class="w100" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="角色状态">
<el-switch v-model="state.ruleForm.status" inline-prompt active-text="启" inactive-text="禁"></el-switch>
<el-switch v-model="state.ruleForm.state" inline-prompt active-text="启" inactive-text="禁"></el-switch>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="角色描述">
<el-input v-model="state.ruleForm.describe" type="textarea" placeholder="请输入角色描述" maxlength="150"></el-input>
<el-input v-model="state.ruleForm.description" type="textarea" placeholder="请输入角色描述" maxlength="150"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@ -54,17 +54,17 @@
import { reactive, ref } from 'vue';
// /
const emit = defineEmits(['refresh']);
const emit = defineEmits(['reset']);
//
const roleDialogFormRef = ref();
const state = reactive({
ruleForm: {
roleName: '', //
roleSign: '', //
sort: 0, //
status: true, //
describe: '', //
name: '', //
acgroup: '', //
id: 0, //
state: true, //
description: '', //
},
menuData: [] as TreeType[],
menuProps: {
@ -80,7 +80,7 @@ const state = reactive({
});
//
const openDialog = (type: string, row: RowRoleType) => {
const openDialog = (type: string, row: any) => {
if (type === 'edit') {
state.ruleForm = row;
state.dialog.title = '修改角色';
@ -107,7 +107,7 @@ const onCancel = () => {
//
const onSubmit = () => {
closeDialog();
emit('refresh');
emit('reset');
// if (state.dialog.type === 'add') { }
};
//

View File

@ -18,23 +18,23 @@
</div>
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="roleName" label="角色名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="roleSign" label="角色标识" show-overflow-tooltip></el-table-column>
<el-table-column prop="sort" label="排序" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="角色状态" show-overflow-tooltip>
<el-table-column prop="name" label="角色名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="acgroup" label="角色标识" show-overflow-tooltip></el-table-column>
<el-table-column prop="id" label="排序" show-overflow-tooltip></el-table-column>
<el-table-column prop="state" label="角色状态" show-overflow-tooltip>
<template #default="scope">
<el-tag type="success" v-if="scope.row.status">启用</el-tag>
<el-tag type="success" v-if="scope.row.state">启用</el-tag>
<el-tag type="info" v-else>禁用</el-tag>
</template>
</el-table-column>
<el-table-column prop="describe" label="角色描述" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="description" label="角色描述" show-overflow-tooltip></el-table-column>
<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="100">
<template #default="scope">
<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)"
<el-button :disabled="scope.row.name === '管理员'" size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)"
>修改</el-button
>
<el-button :disabled="scope.row.roleName === '超级管理员'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
<el-button :disabled="scope.row.name === '管理员'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -52,17 +52,20 @@
>
</el-pagination>
</div>
<RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
<RoleDialog ref="roleDialogRef" @reset="reset" />
</div>
</template>
<script setup lang="ts" name="systemRole">
import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { ElMessageBox, ElMessage,TableColumnCtx } from 'element-plus';
import { RoleApi } from '/@/api/role';
//
const RoleDialog = defineAsyncComponent(() => import('/@/views/usermanage/role/dialog.vue'));
const roleapi = RoleApi();
//
const roleDialogRef = ref();
const state = reactive<SysRoleState>({
@ -78,24 +81,39 @@ const state = reactive<SysRoleState>({
},
});
//
const getTableData = () => {
const getTableData = async() => {
state.tableData.loading = true;
const data = [];
for (let i = 0; i < 20; i++) {
data.push({
roleName: i === 0 ? '超级管理员' : '普通用户',
roleSign: i === 0 ? 'admin' : 'common',
describe: `测试角色${i + 1}`,
sort: i,
status: true,
createTime: new Date().toLocaleString(),
});
// const data = [];
// for (let i = 0; i < 20; i++) {
// data.push({
// roleName: i === 0 ? '' : '',
// roleSign: i === 0 ? 'admin' : 'common',
// describe: `${i + 1}`,
// sort: i,
// status: true,
// createTime: new Date().toLocaleString(),
// });
// }
// state.tableData.data = data;
// state.tableData.total = state.tableData.data.length;
try{
const res = await roleapi.getRoleList(state.tableData.param);
// console.log(res.data);
if(res?.success){
state.tableData.data = res.data.records;
state.tableData.total = res.data.total;
// console.log(state.tableData.data);
}else{
ElMessage.error('角色列表获取失败!');
}
state.tableData.data = data;
state.tableData.total = state.tableData.data.length;
}catch(error){
console.error(error);
}finally{
setTimeout(() => {
state.tableData.loading = false;
}, 500);
}
};
//
const onOpenAddRole = (type: string) => {
@ -106,18 +124,49 @@ const onOpenEditRole = (type: string, row: Object) => {
roleDialogRef.value.openDialog(type, row);
};
//
const onRowDel = (row: RowRoleType) => {
ElMessageBox.confirm(`此操作将永久删除角色名称:“${row.roleName}”,是否继续?`, '提示', {
const onRowDel = (row: any) => {
ElMessageBox.confirm(`此操作将永久删除角色名称:“${row.name}”,是否继续?`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
getTableData();
ElMessage.success('删除成功');
.then(async() => {
// getTableData();
// ElMessage.success('');
try{
state.tableData.loading = true;
const res = await roleapi.deleteRole(row.id);
if(res?.success){
reset();
ElMessage.success('角色删除成功!');
} else ElMessage.error('角色删除失败!');
}catch(error){
ElMessage.error('处理失败!');
}finally{
state.tableData.loading = false;
}
})
.catch(() => {});
};
//
const reset = (index = 0) =>{
state.tableData.param = {
// moduleid:moduleList.value
pageNum: index ? state.tableData.param.pageNum : 1,
pageSize: 10,
},
console.log(index,state.tableData.param);
getTableData();
};
//
const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
let date = new Date(row.createtime);
return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
};
//
const onHandleSizeChange = (val: number) => {
state.tableData.param.pageSize = val;