La123123.
/
im-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

标签/用户/首页页面更新，权限更正

master
La123123 1 month ago
parent
7ebe942bfa
commit
c5b441483d
3 changed files with 101 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      im-admin-ui/src/api/im/group/index.ts
  2. 62
      im-admin-ui/src/views/im/user/index.vue
  3. 118
      im-admin-ui/src/views/index.vue

7
im-admin-ui/src/api/im/group/index.ts
View File

@ -39,7 +39,6 @@ export const ban = (data: GroupBanDTO) => {
}); });
}; };
/** /**
* 解封用户 * 解封用户
* @param data * @param data
@ -52,16 +51,13 @@ export const unban = (data: GroupUnbanDTO) => {
}); });
}; };
export const findGroupByName = (name?: String): AxiosPromise<GroupVO[]> => { export const findGroupByName = (name?: String): AxiosPromise<GroupVO[]> => {
return request({ return request({
url: '/im/group/findByName?name='+name, url: '/im/group/findByName?name=' + name,
method: 'get' method: 'get'
}); });
}; };
/** /**
* 获取总群组数量 * 获取总群组数量
*/ */
@ -71,4 +67,3 @@ export const getTotalGroupCount = (): AxiosPromise<number> => {
method: 'get' method: 'get'
}); });
}; };

62
im-admin-ui/src/views/im/user/index.vue
View File

@ -106,8 +106,8 @@
<el-button v-if="scope.row.isBanned" v-hasPermi="['im:user:ban']" link type="danger" @click="unbanHandle(scope.row)">解封</el-button> <el-button v-if="scope.row.isBanned" v-hasPermi="['im:user:ban']" link type="danger" @click="unbanHandle(scope.row)">解封</el-button>
<el-button v-else v-hasPermi="['im:user:ban']" link type="danger" @click="banHandle(scope.row)">封禁</el-button> <el-button v-else v-hasPermi="['im:user:ban']" link type="danger" @click="banHandle(scope.row)">封禁</el-button>
--> -->
<el-button v-hasPermi="['im:user:label']" link type="primary" @click="handleLabel(scope.row)">设置标签</el-button> <el-button v-hasPermi="['im:user:editGroupAndLabel']" link type="primary" @click="handleLabel(scope.row)">设置标签</el-button>
<el-button v-hasPermi="['im:user:group']" link type="primary" @click="handleGroup(scope.row)">设置分组</el-button> <el-button v-hasPermi="['im:user:editGroupAndLabel']" link type="primary" @click="handleGroup(scope.row)">设置分组</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -303,13 +303,13 @@ const handleLabel = (row?: UserVO) => {
proxy?.$modal?.msgError('请选择一个用户'); proxy?.$modal?.msgError('请选择一个用户');
return; return;
} }
editingUser.value = row || userList.value.find((u) => u.id === ids.value[0]) || null; editingUser.value = row || userList.value.find((u) => u.id === ids.value[0]) || null;
if (!editingUser.value) { if (!editingUser.value) {
proxy?.$modal?.msgError('请先选择一个用户'); proxy?.$modal?.msgError('请先选择一个用户');
return; return;
} }
isBatchMode.value = false; isBatchMode.value = false;
selectedLabelIds.value = (editingUser.value.labelIds || '') selectedLabelIds.value = (editingUser.value.labelIds || '')
.toString() .toString()
@ -325,13 +325,13 @@ const handleGroup = (row?: UserVO) => {
proxy?.$modal?.msgError('请选择一个用户'); proxy?.$modal?.msgError('请选择一个用户');
return; return;
} }
editingUser.value = row || userList.value.find((u) => u.id === ids.value[0]) || null; editingUser.value = row || userList.value.find((u) => u.id === ids.value[0]) || null;
if (!editingUser.value) { if (!editingUser.value) {
proxy?.$modal?.msgError('请先选择一个用户'); proxy?.$modal?.msgError('请先选择一个用户');
return; return;
} }
isBatchMode.value = false; isBatchMode.value = false;
selectedGroupIds.value = (editingUser.value.groupIds || '') selectedGroupIds.value = (editingUser.value.groupIds || '')
.toString() .toString()
@ -350,13 +350,13 @@ const confirmLabel = async () => {
proxy?.$modal?.msgError('请至少选择一个用户'); proxy?.$modal?.msgError('请至少选择一个用户');
return; return;
} }
const labelIdsStr = selectedLabelIds.value.join(','); const labelIdsStr = selectedLabelIds.value.join(',');
const payload = ids.value.map(id => ({ const payload = ids.value.map((id) => ({
id: id, id: id,
labelIds: labelIdsStr labelIds: labelIdsStr
})); }));
await updateBatchUser(payload); await updateBatchUser(payload);
proxy?.$modal?.msgSuccess(`成功为 ${ids.value.length} 个用户设置标签`); proxy?.$modal?.msgSuccess(`成功为 ${ids.value.length} 个用户设置标签`);
} else { } else {
@ -365,19 +365,21 @@ const confirmLabel = async () => {
proxy?.$modal?.msgError('用户信息不存在'); proxy?.$modal?.msgError('用户信息不存在');
return; return;
} }
const payload = [{ const payload = [
id: editingUser.value.id, {
labelIds: selectedLabelIds.value.join(',') id: editingUser.value.id,
}]; labelIds: selectedLabelIds.value.join(',')
}
];
// 乐观更新 UI // 乐观更新 UI
editingUser.value.labelIds = payload[0].labelIds; editingUser.value.labelIds = payload[0].labelIds;
await updateBatchUser(payload); await updateBatchUser(payload);
proxy?.$modal?.msgSuccess('设置标签成功'); proxy?.$modal?.msgSuccess('设置标签成功');
} }
// 刷新列表 // 刷新列表
await getList(); await getList();
} catch (error) { } catch (error) {
@ -409,13 +411,13 @@ const confirmGroup = async () => {
proxy?.$modal?.msgError('请至少选择一个用户'); proxy?.$modal?.msgError('请至少选择一个用户');
return; return;
} }
const groupIdsStr = selectedGroupIds.value.join(','); const groupIdsStr = selectedGroupIds.value.join(',');
const payload = ids.value.map(id => ({ const payload = ids.value.map((id) => ({
id: id, id: id,
groupIds: groupIdsStr groupIds: groupIdsStr
})); }));
await updateBatchUser(payload); await updateBatchUser(payload);
proxy?.$modal?.msgSuccess(`成功为 ${ids.value.length} 个用户设置分组`); proxy?.$modal?.msgSuccess(`成功为 ${ids.value.length} 个用户设置分组`);
} else { } else {
@ -424,19 +426,21 @@ const confirmGroup = async () => {
proxy?.$modal?.msgError('用户信息不存在'); proxy?.$modal?.msgError('用户信息不存在');
return; return;
} }
const payload = [{ const payload = [
id: editingUser.value.id, {
groupIds: selectedGroupIds.value.join(',') id: editingUser.value.id,
}]; groupIds: selectedGroupIds.value.join(',')
}
];
// 乐观更新 UI // 乐观更新 UI
editingUser.value.groupIds = payload[0].groupIds; editingUser.value.groupIds = payload[0].groupIds;
await updateBatchUser(payload); await updateBatchUser(payload);
proxy?.$modal?.msgSuccess('设置分组成功'); proxy?.$modal?.msgSuccess('设置分组成功');
} }
// 刷新列表 // 刷新列表
await getList(); await getList();
} catch (error) { } catch (error) {
@ -610,4 +614,4 @@ onMounted(async () => {
await getLabelAndGroupList(); await getLabelAndGroupList();
getList(); getList();
}); });
</script> </script>

118
im-admin-ui/src/views/index.vue
View File

@ -5,7 +5,7 @@
<el-col :span="6"> <el-col :span="6">
<el-card class="statistics-card"> <el-card class="statistics-card">
<div class="statistics-item"> <div class="statistics-item">
<div class="statistics-icon" style="background-color: #409EFF;"> <div class="statistics-icon" style="background-color: #409eff">
<el-icon size="24"> <el-icon size="24">
<User /> <User />
</el-icon> </el-icon>
@ -20,7 +20,7 @@
<el-col :span="6"> <el-col :span="6">
<el-card class="statistics-card"> <el-card class="statistics-card">
<div class="statistics-item"> <div class="statistics-item">
<div class="statistics-icon" style="background-color: #67C23A;"> <div class="statistics-icon" style="background-color: #67c23a">
<el-icon size="24"> <el-icon size="24">
<ChatDotRound /> <ChatDotRound />
</el-icon> </el-icon>
@ -35,7 +35,7 @@
<el-col :span="6"> <el-col :span="6">
<el-card class="statistics-card"> <el-card class="statistics-card">
<div class="statistics-item"> <div class="statistics-item">
<div class="statistics-icon" style="background-color: #E6A23C;"> <div class="statistics-icon" style="background-color: #e6a23c">
<el-icon size="24"> <el-icon size="24">
<Timer /> <Timer />
</el-icon> </el-icon>
@ -50,7 +50,7 @@
<el-col :span="6"> <el-col :span="6">
<el-card class="statistics-card"> <el-card class="statistics-card">
<div class="statistics-item"> <div class="statistics-item">
<div class="statistics-icon" style="background-color: #909399;"> <div class="statistics-icon" style="background-color: #909399">
<el-icon size="24"> <el-icon size="24">
<Clock /> <Clock />
</el-icon> </el-icon>
@ -67,34 +67,32 @@
<!-- 统计图表 --> <!-- 统计图表 -->
<div class="chart-section"> <div class="chart-section">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="24">
<el-card> <el-card>
<template #header> <template #header>
<span>用户注册</span> <span>用户注册</span>
<el-select v-model="registrationSelectedDays" @change="loadRegistrationChartData" <el-select v-model="registrationSelectedDays" @change="loadRegistrationChartData" style="width: 100px; float: right" size="small">
style="width: 100px; float: right;" size="small">
<el-option label="7天" :value="7"></el-option> <el-option label="7天" :value="7"></el-option>
<el-option label="15天" :value="15"></el-option> <el-option label="15天" :value="15"></el-option>
<el-option label="30天" :value="30"></el-option> <el-option label="30天" :value="30"></el-option>
</el-select> </el-select>
</template> </template>
<div ref="registrationChartContainer" style="width: 100%; height: 300px;"></div> <div ref="registrationChartContainer" style="width: 100%; height: 300px"></div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-card> <el-card>
<template #header> <template #header>
<span>消息统计</span> <span>消息统计</span>
<el-select v-model="selectedDays" @change="loadChartData" style="width: 100px; float: right;" <el-select v-model="selectedDays" @change="loadChartData" style="width: 100px; float: right" size="small">
size="small">
<el-option label="7天" :value="7"></el-option> <el-option label="7天" :value="7"></el-option>
<el-option label="15天" :value="15"></el-option> <el-option label="15天" :value="15"></el-option>
<el-option label="30天" :value="30"></el-option> <el-option label="30天" :value="30"></el-option>
</el-select> </el-select>
</template> </template>
<div ref="chartContainer" style="width: 100%; height: 300px;"></div> <div ref="chartContainer" style="width: 100%; height: 300px"></div>
</el-card> </el-card>
</el-col> </el-col> -->
</el-row> </el-row>
</div> </div>
</div> </div>
@ -165,7 +163,6 @@ const loadActiveUserStats = async () => {
} }
}; };
// 加载图表数据 // 加载图表数据
const loadChartData = async () => { const loadChartData = async () => {
try { try {
@ -217,11 +214,11 @@ const processChartData = (privateData: any[], groupData: any[]) => {
dates.push(dateStr); dates.push(dateStr);
// 查找对应日期的私聊数据 // 查找对应日期的私聊数据
const privateDayData = privateData.find(item => item.date === dateStr); const privateDayData = privateData.find((item) => item.date === dateStr);
privateCounts.push(privateDayData ? parseInt(privateDayData.count) : 0); privateCounts.push(privateDayData ? parseInt(privateDayData.count) : 0);
// 查找对应日期的群聊数据 // 查找对应日期的群聊数据
const groupDayData = groupData.find(item => item.date === dateStr); const groupDayData = groupData.find((item) => item.date === dateStr);
groupCounts.push(groupDayData ? parseInt(groupDayData.count) : 0); groupCounts.push(groupDayData ? parseInt(groupDayData.count) : 0);
} }
@ -243,9 +240,11 @@ const loadRegistrationChartData = async () => {
xAxis: { xAxis: {
data: chartData.dates data: chartData.dates
}, },
series: [{ series: [
data: chartData.counts {
}] data: chartData.counts
}
]
}); });
} }
} catch (error) { } catch (error) {
@ -267,7 +266,7 @@ const processRegistrationChartData = (data: any[]) => {
dates.push(dateStr); dates.push(dateStr);
// 查找对应日期的数据 // 查找对应日期的数据
const dayData = data.find(item => item.date === dateStr); const dayData = data.find((item) => item.date === dateStr);
counts.push(dayData ? parseInt(dayData.count) : 0); counts.push(dayData ? parseInt(dayData.count) : 0);
} }
@ -328,11 +327,16 @@ const initChart = async () => {
y: 0, y: 0,
x2: 0, x2: 0,
y2: 1, y2: 1,
colorStops: [{ colorStops: [
offset: 0, color: 'rgba(64, 158, 255, 0.3)' {
}, { offset: 0,
offset: 1, color: 'rgba(64, 158, 255, 0.1)' color: 'rgba(64, 158, 255, 0.3)'
}] },
{
offset: 1,
color: 'rgba(64, 158, 255, 0.1)'
}
]
} }
} }
}, },
@ -351,11 +355,16 @@ const initChart = async () => {
y: 0, y: 0,
x2: 0, x2: 0,
y2: 1, y2: 1,
colorStops: [{ colorStops: [
offset: 0, color: 'rgba(103, 194, 58, 0.3)' {
}, { offset: 0,
offset: 1, color: 'rgba(103, 194, 58, 0.1)' color: 'rgba(103, 194, 58, 0.3)'
}] },
{
offset: 1,
color: 'rgba(103, 194, 58, 0.1)'
}
]
} }
} }
} }
@ -415,29 +424,36 @@ const initRegistrationChart = async () => {
type: 'value', type: 'value',
name: '注册用户数' name: '注册用户数'
}, },
series: [{ series: [
name: '注册用户', {
type: 'line', name: '注册用户',
data: [], type: 'line',
smooth: true, data: [],
itemStyle: { smooth: true,
color: '#E6A23C' itemStyle: {
}, color: '#E6A23C'
areaStyle: { },
color: { areaStyle: {
type: 'linear', color: {
x: 0, type: 'linear',
y: 0, x: 0,
x2: 0, y: 0,
y2: 1, x2: 0,
colorStops: [{ y2: 1,
offset: 0, color: 'rgba(230, 162, 60, 0.3)' colorStops: [
}, { {
offset: 1, color: 'rgba(230, 162, 60, 0.1)' offset: 0,
}] color: 'rgba(230, 162, 60, 0.3)'
},
{
offset: 1,
color: 'rgba(230, 162, 60, 0.1)'
}
]
}
} }
} }
}], ],
grid: { grid: {
left: '3%', left: '3%',
right: '4%', right: '4%',

Write Preview
Loading…
Cancel
Save