新增邮件群发和数据可视化

This commit is contained in:
eoao
2025-06-17 09:20:00 +08:00
parent ea309f9171
commit 605829f180
65 changed files with 2352 additions and 900 deletions

View File

@@ -0,0 +1,838 @@
<template>
<div v-if="analysisLoading" class="analysis-loading">
<loading />
</div>
<el-scrollbar v-else style="height: 100%;">
<div class="analysis" :key="boxKey">
<div class="number">
<div class="number-item">
<div class="top">
<div class="left">
<div>收件数量</div>
<div>
<el-statistic :formatter="value => Math.round(value)" :value="receiveData"/>
</div>
</div>
<div class="right">
<div class="count-icon">
<Icon icon="hugeicons:mailbox-01" width="25" height="25"></Icon>
</div>
</div>
</div>
<div class="delete-ratio">
<div>正常 <span class="normal">{{numberCount.normalReceiveTotal}}</span></div>
<div>删除 <span class="deleted">{{numberCount.delReceiveTotal}}</span></div>
</div>
</div>
<div class="number-item">
<div class="top">
<div class="left">
<div>发件数量</div>
<div>
<el-statistic :formatter="value => Math.round(value)" :value="sendData"/>
</div>
</div>
<div class="right">
<div class="count-icon">
<Icon icon="cil:send" width="25" height="25"></Icon>
</div>
</div>
</div>
<div class="delete-ratio">
<div>正常 <span class="normal">{{numberCount.normalSendTotal}}</span></div>
<div>删除 <span class="deleted">{{numberCount.delSendTotal}}</span></div>
</div>
</div>
<div class="number-item">
<div class="top">
<div class="left">
<div>邮箱数量</div>
<div>
<el-statistic :formatter="value => Math.round(value)" :value="accountData"/>
</div>
</div>
<div class="right">
<div class="count-icon">
<Icon icon="lets-icons:e-mail" width="23" height="23"></Icon>
</div>
</div>
</div>
<div class="delete-ratio">
<div>正常 <span class="normal">{{numberCount.normalAccountTotal}}</span></div>
<div>删除 <span class="deleted">{{numberCount.delAccountTotal}}</span></div>
</div>
</div>
<div class="number-item">
<div class="top">
<div class="left">
<div>用户数量</div>
<div>
<el-statistic :formatter="value => Math.round(value)" :value="userData"/>
</div>
</div>
<div class="right">
<div class="count-icon">
<Icon icon="iconoir:user" width="25" height="25"></Icon>
</div>
</div>
</div>
<div class="delete-ratio">
<div>正常 <span class="normal">{{numberCount.normalUserTotal}}</span></div>
<div>删除 <span class="deleted">{{numberCount.delUserTotal}}</span></div>
</div>
</div>
</div>
<div class="picture">
<div class="picture-item">
<div class="title" style="display: flex;justify-content: space-between;">
<span>邮件来源</span>
<span class="source-button" v-if="false">
<el-radio-group v-model="checkedSourceType" >
<el-radio-button label="发件人" value="sender" />
<el-radio-button label="邮箱" value="email" />
</el-radio-group>
</span>
</div>
<div class="sender-pie">
</div>
</div>
<div class="picture-item">
<div class="title">用户增长</div>
<div class="increase-line">
</div>
</div>
</div>
<div class="picture-cs">
<div class="picture-cs-item">
<div class="title">邮件增长</div>
<div class="email-column"></div>
</div>
<div class="picture-cs-item">
<div class="title">今日发件</div>
<div class="send-count"></div>
</div>
</div>
</div>
</el-scrollbar>
</template>
<script setup>
import {Icon} from "@iconify/vue";
import {useTransition} from "@vueuse/core";
import {defineOptions, onActivated, onDeactivated, onMounted, reactive, ref, watch} from "vue";
import echarts from "@/echarts/index.js";
import dayjs from "dayjs";
import {analysisEcharts} from "@/request/analysis.js";
import {useUiStore} from "@/store/ui.js";
import {debounce} from "lodash-es";
import loading from "@/components/loading/index.vue";
import {useRoute} from "vue-router";
defineOptions({
name: 'analysis'
})
const route = useRoute();
const uiStore = useUiStore()
const checkedSourceType = ref('sender')
const receiveTotal = ref(0)
const sendTotal = ref(0)
const accountTotal = ref(0)
const userTotal = ref(0)
const analysisLoading = ref(true)
const numberCount = reactive({
normalReceiveTotal: 0,
normalSendTotal: 0,
normalAccountTotal: 0,
normalUserTotal: 0,
delReceiveTotal: 0,
delSendTotal: 0,
delAccountTotal: 0,
delUserTotal: 0
})
const receiveData = useTransition(receiveTotal, {
duration: 1500,
})
const sendData = useTransition(sendTotal, {
duration: 1500,
})
const accountData = useTransition(accountTotal, {
duration: 1500,
})
const userData = useTransition(userTotal, {
duration: 1500,
})
const senderData = ref(null)
const userLineData = reactive({
xdata: [],
sdata: []
})
const emailColumnData = {
barWidth: window.innerWidth > 767 ? '40%' : '60%',
receiveData: [],
sendData: [],
daysData: []
}
let daySendTotal = 0
let leaveWidth = 0
let senderPie = null
let increaseLine = null
let emailColumn = null
let sendGauge = null
let first = true
let boxKey = ref(0)
let senderPieLeft = window.innerWidth < 500 ? `${window.innerWidth - 110}` : '72%'
onMounted(() => {
analysisEcharts().then(data => {
receiveTotal.value = data.numberCount.receiveTotal
sendTotal.value = data.numberCount.sendTotal
accountTotal.value = data.numberCount.accountTotal
userTotal.value = data.numberCount.userTotal
numberCount.normalReceiveTotal = data.numberCount.normalReceiveTotal
numberCount.normalSendTotal = data.numberCount.normalSendTotal
numberCount.normalAccountTotal = data.numberCount.normalAccountTotal
numberCount.normalUserTotal = data.numberCount.normalUserTotal
numberCount.delReceiveTotal = data.numberCount.delReceiveTotal
numberCount.delSendTotal = data.numberCount.delSendTotal
numberCount.delAccountTotal = data.numberCount.delAccountTotal
numberCount.delUserTotal = data.numberCount.delUserTotal
senderData.value = data.receiveRatio.nameRatio.map(item => {
return {
name: item.name || ' ',
value: item.total
}
})
userLineData.xdata = data.userDayCount.map(item => dayjs(item.date).format("M.D"))
userLineData.sdata = data.userDayCount.map(item => item.total)
emailColumnData.daysData = data.emailDayCount.receiveDayCount.map(item => dayjs(item.date).format("M.D"))
emailColumnData.receiveData = data.emailDayCount.receiveDayCount.map(item => item.total)
emailColumnData.sendData = data.emailDayCount.sendDayCount.map(item => item.total)
daySendTotal = data.daySendTotal
analysisLoading.value = false
initPicture();
first = false
})
})
function initPicture() {
if(route.name !== 'analysis') return
boxKey.value ++
setTimeout(() => {
createSenderPie()
createIncreaseLine()
createEmailColumnChart();
createSendGauge();
})
}
const widthChange = debounce(initPicture, 500, {
leading: false,
trailing: true
})
watch(() => uiStore.asideShow, () => {
if (window.innerWidth > 1024) {
widthChange()
}
})
onActivated(() => {
if (first) return
if (window.innerWidth !== leaveWidth && leaveWidth !== 0) {
widthChange()
} else if (!senderPie) {
widthChange()
}
})
onDeactivated(() => {
leaveWidth = window.innerWidth
})
window.onresize = () => {
setStyle()
widthChange()
}
function setStyle() {
senderPieLeft = window.innerWidth < 500 ? `${window.innerWidth - 110}` : '72%'
emailColumnData.barWidth = window.innerWidth > 767 ? '40%' : '60%'
}
const measureCtx = document.createElement('canvas').getContext('2d');
measureCtx.font = '12px sans-serif';
function truncateTextByWidth(text,maxWidth = 140) {
let width = measureCtx.measureText(text).width;
if (width <= maxWidth) return text;
let result = '';
for (let i = 0; i < text.length; i++) {
result += text[i];
if (measureCtx.measureText(result + '…').width > maxWidth) {
return result.slice(0, -1) + '…';
}
}
return text;
}
function createSenderPie() {
if (senderPie) {
senderPie.dispose()
}
senderPie = echarts.init(document.querySelector(".sender-pie"))
let option = {
tooltip: {
trigger: 'item',
formatter: params => {
return `${params.marker} ${params.name} ${params.value} (${params.percent}%)`;
}
},
legend: {
type: 'scroll',
orient: 'vertical',
left: '10',
top: '20',
formatter: function (name) {
return truncateTextByWidth(name)
}
},
series: [
{
data: senderData.value,
name: '',
type: 'pie',
radius: ['40%', '65%'],
center: [ senderPieLeft, '45%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 4,
borderColor: '#fff',
borderWidth: 2
},
label: {
show: false,
position: 'outside', // 标签显示在外部
formatter: '{d}%', // 显示名称和占比
color: '#333',
fontSize: 14 // 设置字体大小
},
emphasis: {
label: {
show: false,
fontSize: 40,
fontWeight: 'bold'
}
},
labelLine: {
show: true
},
color: ['#3CB2FF', '#13DEB9', '#FBBF24', '#FF7F50', '#BAE6FD', '#C084FC'] // 添加符合主题的配色
}
]
}
senderPie.setOption(option)
}
function createIncreaseLine() {
if (increaseLine) {
increaseLine.dispose()
}
increaseLine = echarts.init(document.querySelector(".increase-line"))
let option = {
tooltip: {
trigger: 'axis', // 设置触发方式为 'axis',在坐标轴上显示信息
axisPointer: {
type: 'cross', // 指示器的类型为交叉型,适用于折线图等
crossStyle: {
color: '#999' // 设置指示器线的颜色
},
axis: 'x',
},
formatter: function (params) {
let result = ''
params.forEach(item => {
result = `${item.marker} 用户数: ${item.value}`;
});
return result;
},
backgroundColor: '#fff', // 设置背景颜色
borderColor: '#ccc', // 设置边框颜色
borderWidth: 1, // 设置边框宽度
padding: 10, // 设置内边距
textStyle: {
color: '#333', // 设置文字颜色
}
},
grid: {
top: '8%',
right: '20',
left: '35',
bottom: '35'
},
xAxis: {
type: 'category',
data: userLineData.xdata,
axisTick: {
show: false,
alignWithLabel: false, // 刻度线与标签对齐,
lineStyle: {
color: 'red',
}
},
axisPointer: {
label: {
show: false
}
},
axisLine: {
lineStyle: {
color: '#909399',
width: 1,
type: 'solid'
}
},
axisLabel: {
formatter: function (value, index) {
if (index === 0) {
return ' ' + value;
}
if (index === userLineData.xdata.length - 1) {
return value + ' '
}
return value;
},
},
boundaryGap: false,
},
yAxis: {
type: 'value',
axisLabel: {
margin: 5, // 增加y轴刻度数字与网格线之间的间距
},
boundaryGap: [0, 0.1],
max: (params) => {
if (params.max < 8 ) {
return 10
}
},
axisLine: {
show: true,
lineStyle: {
color: '#909399',
width: 1,
}
},
axisPointer: {
label: {
show: true,
formatter: (e) => {
return Math.round(e.value)
}
}
},
splitLine: {
show: true, // 显示网格线
lineStyle: {
type: 'dashed', // 设置网格线为虚线
color: '#ccc' // 设置虚线的颜色
}
}
},
series: [
{
data: userLineData.sdata,
type: 'line',
smooth: 0.1,
symbol: 'none',
lineStyle: {
color: '#1D84FF',
width: 2.5
},
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: 'rgba(29, 132, 255, 0.3)'
},
{
offset: 1,
color: 'rgba(29, 132, 255, 0.03)'
}
])
},
color: ['#1D84FF'],
}
]
};
increaseLine.setOption(option);
}
function createEmailColumnChart() {
if (emailColumn) {
emailColumn.dispose()
}
emailColumn = echarts.init(document.querySelector(".email-column"));
const option = {
tooltip: {
formatter: function (params) {
params.marker
return `${params.marker} ${params.seriesName}: ${params.value}`
}
},
legend: {
data: ['接收', '发送'],
top: '0'
},
grid: {
left: '18',
right: '18',
bottom: '15',
top: '50',
containLabel: true
},
xAxis: {
type: 'category',
data: emailColumnData.daysData,
axisTick: {
show: false
},
axisLine: {
show: true,
lineStyle: {
color: '#909399',
width: 1,
}
},
},
yAxis: {
type: 'value',
boundaryGap: [0, 0.1],
},
series: [
{
name: '接收',
type: 'bar',
stack: 'total', // 堆叠组标识(必须相同)
barWidth: emailColumnData.barWidth,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowColor: 'rgba(0,0,0,0.3)',
}
},
data: emailColumnData.receiveData,
itemStyle: {
color: '#3CB2FF',
}
},
{
name: '发送',
type: 'bar',
stack: 'total', // 堆叠组标识(必须相同)
barWidth: '45%',
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowColor: 'rgba(0,0,0,0.3)'
}
},
data: emailColumnData.sendData,
itemStyle: {
color: '#13deb9',
}
}
]
};
emailColumn.setOption(option);
}
function createSendGauge() {
if(sendGauge) {
sendGauge.dispose()
}
sendGauge = echarts.init(document.querySelector(".send-count"));
let option = {
tooltip: {},
series: [{
name: '今日发件',
type: 'gauge',
max: 100,
// 进度条颜色(新增)
progress: {
show: true,
roundCap: true,
itemStyle: {
color: '#3CB2FF'
}
},
// 指针颜色(新增)
pointer: {
itemStyle: {
color: '#3CB2FF'
}
},
// 轴线背景色(新增)
axisLine: {
roundCap: true,
lineStyle: {
color: [[1, '#E6EBF8']]
}
},
// 刻度颜色(新增)
axisTick: {
lineStyle: {
color: '#999'
}
},
// 中心文字颜色(新增)
detail: {
valueAnimation: true,
formatter: '{value}',
color: '#333' // 黑色文字
},
data: [{
value: daySendTotal,
name: '次数',
// 名称标签颜色(新增)
title: {
color: '#333' // 灰色标签
}
}]
}],
color: ['#3CB2FF']
};
sendGauge.setOption(option);
}
</script>
<style>
.percentage-value {
display: block;
margin-top: 10px;
font-size: 28px;
}
.percentage-label {
display: block;
margin-top: 10px;
font-size: 12px;
}
</style>
<style scoped lang="scss">
.analysis-loading {
height: 100%;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.analysis {
height: 100%;
padding: 20px 20px 30px;
gap: 20px;
background: #FAFCFF;
display: grid;
grid-auto-rows: min-content;
@media (max-width: 1024px) {
padding: 15px 15px 30px;
gap: 15px
}
.title {
margin-top: 10px;
margin-left: 15px;
font-size: 18px;
font-weight: 500;
}
.number {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
gap: 20px;
@media (max-width: 1024px) {
grid-template-columns: 1fr 1fr;
gap: 15px;
}
@media (max-width: 767px) {
grid-template-columns: 1fr;
}
.number-item {
background: #fff;
border-radius: 8px;
border: 1px solid var(--el-border-color);
padding: 25px 20px;
.top {
display: grid;
justify-content: space-between;
align-content: center;
grid-template-columns: auto auto;
.left {
display: grid;
gap: 5px;
grid-auto-rows: min-content;
> div:last-child {
font-size: 13px;
}
:deep(.el-statistic__number) {
font-size: 26px;
}
}
.right {
display: grid;
align-items: center;
.count-icon {
top: 3px;
position: relative;
display: grid;
align-items: center;
padding: 14px;
border-radius: 8px;
background: var(--el-color-primary-light-9);
color: var(--el-color-primary);
}
}
}
.delete-ratio {
width: 100%;
display: grid;
grid-template-columns: auto auto;
justify-content: start;
gap: 20px;
padding-top: 5px;
.normal {
width: fit-content;
color: var(--el-color-success);
font-weight: bold;
margin-left: 3px;
}
.deleted {
width: fit-content;
color: var(--el-color-danger);
font-weight: bold;
margin-left: 3px;
}
}
}
}
.picture {
display: grid;
grid-template-columns: 500px 1fr;
gap: 20px;
@media (max-width: 1620px) {
grid-template-columns: 1fr;
}
@media (max-width: 1024px) {
gap: 15px;
}
.picture-item {
background: #fff;
border-radius: 8px;
border: 1px solid var(--el-border-color);
.source-button {
padding-right: 15px;
display: flex;
align-items: start;
:deep(.el-radio-button__inner) {
padding: 6px 10px;
}
}
.sender-pie {
height: 350px;
@media (max-width: 767px) {
height: 200px;
}
}
.increase-line {
height: 350px;
@media (max-width: 767px) {
height: 280px;
}
}
}
}
.picture-cs {
display: grid;
grid-template-columns: 1fr 500px;
gap: 20px;
@media (max-width: 1620px) {
grid-template-columns: 1fr;
gap: 15px;
}
.picture-cs-item {
background: #fff;
border-radius: 8px;
border: 1px solid var(--el-border-color);
.send-count {
height: 350px;
@media (max-width: 767px) {
height: 320px;
}
}
.email-column {
height: 350px;
@media (max-width: 767px) {
height: 250px;
}
}
}
}
}
</style>

View File

@@ -3,10 +3,11 @@
<div class="header-actions">
<Icon class="icon" icon="material-symbols-light:arrow-back-ios-new" width="20" height="20" @click="handleBack"/>
<Icon v-perm="'email:delete'" class="icon" icon="uiw:delete" width="16" height="16" @click="handleDelete"/>
<template v-if="emailStore.contentData.showStar">
<Icon class="icon" @click="changeStar" v-if="email.isStar" icon="fluent-color:star-16" width="20" height="20"/>
<Icon class="icon" @click="changeStar" v-else icon="solar:star-line-duotone" width="18" height="18"/>
</template>
<span class="star" v-if="emailStore.contentData.showStar">
<Icon class="icon" @click="changeStar" v-if="email.isStar" icon="fluent-color:star-16" width="21" height="20"/>
<Icon class="icon" @click="changeStar" v-else icon="solar:star-line-duotone" width="19" height="19"/>
</span>
<Icon class="icon" v-if="emailStore.contentData.showReply" @click="openReply" icon="carbon:reply" width="20" height="20" />
</div>
<div></div>
<el-scrollbar class="scrollbar">
@@ -23,12 +24,11 @@
<span><{{ email.sendEmail }}></span>
</div>
</div>
<div class="receive"><span class="source">收件人</span><span>{{ email.receiveEmail }}</span></div>
<div class="receive"><span class="source">收件人</span><span class="receive-email">{{ formateReceive(email.recipient) }}</span></div>
<div class="date">
<div>{{ formatDetailDate(email.createTime) }}</div>
</div>
</div>
<el-alert v-if="email.status === 3" :closable="false" :title="'发送失败: ' + toMessage(email.message)" class="email-msg" type="error" show-icon />
<el-alert v-if="email.status === 4" :closable="false" title="被标记为垃圾邮件" class="email-msg" type="warning" show-icon />
<el-alert v-if="email.status === 5" :closable="false" title="邮件发送被延迟" class="email-msg" type="warning" show-icon />
@@ -87,7 +87,9 @@ import {cvtR2Url} from "@/utils/convert.js";
import {getIconByName} from "@/utils/icon-utils.js";
import {useSettingStore} from "@/store/setting.js";
import {sysEmailDelete} from "@/request/sys-email.js";
import {useUiStore} from "@/store/ui.js";
const uiStore = useUiStore();
const settingStore = useSettingStore();
const accountStore = useAccountStore();
const emailStore = useEmailStore();
@@ -96,10 +98,15 @@ const email = emailStore.contentData.email
const showPreview = ref(false)
const srcList = reactive([])
watch(() => accountStore.currentAccountId, () => {
handleBack()
})
function openReply() {
uiStore.writerRef.openReply(email)
}
function toMessage(message) {
return message ? JSON.parse(message).message : '';
}
@@ -119,10 +126,13 @@ function showImage(key) {
}
function isImage(filename) {
return ['png', 'jpg', 'jpeg', 'bmp', 'gif'].includes(getExtName(filename))
return ['png', 'jpg', 'jpeg', 'bmp', 'gif','jfif'].includes(getExtName(filename))
}
function formateReceive(recipient) {
recipient = JSON.parse(recipient)
return recipient.map(item => item.address).join(', ')
}
function changeStar() {
if (email.isStar) {
@@ -194,7 +204,11 @@ const handleDelete = () => {
gap: 20px;
box-shadow: inset 0 -1px 0 0 rgba(100, 121, 143, 0.12);
font-size: 18px;
.star {
display: flex;
align-items: center;
min-width: 21px;
}
.icon {
cursor: pointer;
}
@@ -232,8 +246,7 @@ const handleDelete = () => {
.att {
margin-top: 30px;
margin-bottom: 30px;
border: 1px solid #e4e7ed;
box-shadow: var(--el-box-shadow-light);
border: 1px solid var(--el-border-color);
padding: 10px;
border-radius: 4px;
width: fit-content;
@@ -336,7 +349,11 @@ const handleDelete = () => {
.receive {
margin-bottom: 6px;
display: flex;
.receive-email {
max-width: 700px;
word-break: break-word;
}
span:nth-child(2) {
color: #585d69;
}

View File

@@ -64,6 +64,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'logic'
emailStore.contentData.showStar = true
emailStore.contentData.showReply = true
router.push('/content')
}

View File

@@ -90,7 +90,6 @@ import router from "@/router";
import {computed, nextTick, reactive, ref} from "vue";
import {login} from "@/request/login.js";
import {register} from "@/request/login.js";
import {ElMessage} from 'element-plus'
import {isEmail} from "@/utils/verify-utils.js";
import {useSettingStore} from "@/store/setting.js";
import {useAccountStore} from "@/store/account.js";
@@ -328,7 +327,6 @@ function submitRegister() {
box-shadow: var(--el-box-shadow-light);
@media (max-width: 1024px) {
padding: 20px 18px;
border-radius: 6px;
width: 384px;
margin-left: 18px;
}

View File

@@ -96,7 +96,6 @@
import {Icon} from "@iconify/vue";
import {defineOptions, nextTick, reactive, ref} from "vue";
import {roleAdd, roleDelete, rolePermTree, roleRoleList, roleSet, roleSetDef} from "@/request/role.js";
import {ElMessage, ElMessageBox} from "element-plus";
import loading from '@/components/loading/index.vue';
import {useRoleStore} from "@/store/role.js";
import {useUserStore} from "@/store/user.js";

View File

@@ -58,6 +58,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'logic'
emailStore.contentData.showStar = true
emailStore.contentData.showReply = true
router.push('/content')
}

View File

@@ -2,6 +2,23 @@
<div class="box">
<div class="pass">
<div class="title">账户与密码</div>
<div class="pass-item">
<div>用户名</div>
<div>
<span v-if="setNameShow" class="edit-name-input">
<el-input v-model="accountName" ></el-input>
<span class="edit-name" @click="setName">
保存
</span>
</span>
<span v-else class="user-name">
<span >{{ userStore.user.name }}</span>
<span class="edit-name" @click="showSetName">
修改
</span>
</span>
</div>
</div>
<div class="pass-item">
<div>邮箱</div>
<div>{{ userStore.user.email }}</div>
@@ -9,7 +26,7 @@
<div class="pass-item">
<div>密码</div>
<div>
<el-button type="primary" @click="pwdShow = true">修改密码</el-button>
<el-button type="primary" @click="pwdShow = true">修改密码</el-button>
</div>
</div>
</div>
@@ -23,11 +40,11 @@
</div>
</div>
<el-dialog v-model="pwdShow" title="修改密码" width="340">
<div class="update-pwd">
<el-input type="password" placeholder="新的密码" v-model="form.password"/>
<el-input type="password" placeholder="确认密码" v-model="form.newPwd"/>
<el-button type="primary" :loading="setPwdLoading" @click="submitPwd">保存</el-button>
</div>
<div class="update-pwd">
<el-input type="password" placeholder="新的密码" v-model="form.password"/>
<el-input type="password" placeholder="确认密码" v-model="form.newPwd"/>
<el-button type="primary" :loading="setPwdLoading" @click="submitPwd">保存</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -35,16 +52,60 @@
import {defineOptions} from "vue";
import {reactive, ref} from 'vue'
import {resetPassword, userDelete} from "@/request/my.js";
import {ElMessage, ElMessageBox} from "element-plus";
import {useUserStore} from "@/store/user.js";
import router from "@/router/index.js";
import {accountSetName} from "@/request/account.js";
import {useAccountStore} from "@/store/account.js";
const accountStore = useAccountStore()
const userStore = useUserStore();
const setPwdLoading = ref(false)
const setNameShow = ref(false)
const accountName = ref(null)
defineOptions({
name: 'setting'
})
function showSetName() {
accountName.value = userStore.user.name
setNameShow.value = true
}
function setName() {
if (!accountName.value) {
ElMessage({
message: '用户名不能为空',
type: 'error',
plain: true,
})
return;
}
setNameShow.value = false
let name = accountName.value
if (name === userStore.user.name) {
return
}
userStore.user.name = accountName.value
accountSetName(userStore.user.accountId,name).then(() => {
ElMessage({
message: '修改成功',
type: 'success',
plain: true,
})
accountStore.changeUserAccountName = name
}).catch(() => {
userStore.user.name = name
})
}
const pwdShow = ref(false)
const form = reactive({
password: '',
@@ -121,6 +182,10 @@ function submitPwd() {
.box {
padding: 40px 40px;
@media (max-width: 767px) {
padding: 30px 30px;
}
.update-pwd {
display: flex;
flex-direction: column;
@@ -134,8 +199,7 @@ function submitPwd() {
.pass {
font-size: 14px;
display: flex;
flex-direction: column;
display: grid;
gap: 20px;
margin-bottom: 40px;
@@ -143,12 +207,39 @@ function submitPwd() {
display: grid;
grid-template-columns: 50px 1fr;
gap: 140px;
@media (max-width: 767px) {
gap: 80px;
position: relative;
.user-name {
display: grid;
grid-template-columns: auto 1fr;
span:first-child {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.edit-name-input {
position: absolute;
bottom: -6px;
.el-input {
width: min(200px,calc(100vw - 222px));
}
}
.edit-name {
color: #4dabff;
padding-left: 10px;
cursor: pointer;
}
@media (max-width: 767px) {
gap: 70px;
}
div:first-child {
font-weight: bold;
}
div:last-child {
overflow: hidden;
white-space: nowrap;

View File

@@ -31,6 +31,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'logic'
emailStore.contentData.showStar = true
emailStore.contentData.showReply = true
router.push('/content')
}

View File

@@ -144,6 +144,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'physics'
emailStore.contentData.showStar = false
emailStore.contentData.showReply = false
router.push('/content')
}

View File

@@ -299,7 +299,6 @@
<script setup>
import {defineOptions, onMounted, reactive, ref} from "vue";
import {physicsDeleteAll, setBackground, settingQuery, settingSet} from "@/request/setting.js";
import {ElMessage, ElMessageBox} from "element-plus";
import {useSettingStore} from "@/store/setting.js";
import {useUserStore} from "@/store/user.js";
import {useAccountStore} from "@/store/account.js";
@@ -498,8 +497,6 @@ function jump(href) {
doc.click()
}
function editSetting(settingForm, refreshStatus = true) {
if (settingLoading.value) return
settingLoading.value = true
@@ -533,6 +530,7 @@ function editSetting(settingForm, refreshStatus = true) {
.settings-container {
height: 100%;
overflow: hidden;
background: #FAFCFF;
}
.scroll {
@@ -573,18 +571,17 @@ function editSetting(settingForm, refreshStatus = true) {
.settings-card {
background-color: #fff;
border-radius: 4px;
border: 1px solid #e4e7ed;
border-radius: 8px;
border: 1px solid var(--el-border-color);
transition: all 300ms;
box-shadow: var(--el-box-shadow-light);
overflow: hidden;
}
.card-title {
font-size: 16px;
font-size: 15px;
font-weight: bold;
padding: 10px 20px;
border-bottom: 1px solid #e6e6e6;
border-bottom: 1px solid var(--el-border-color);
}
.card-content {

View File

@@ -233,7 +233,6 @@ import {
} from '@/request/user.js'
import {roleSelectUse} from "@/request/role.js";
import {Icon} from "@iconify/vue";
import {ElMessage, ElMessageBox, ElRadio, ElRadioGroup} from "element-plus";
import loading from "@/components/loading/index.vue";
import {tzDayjs} from "@/utils/day.js";
import {useSettingStore} from "@/store/setting.js";
@@ -841,11 +840,12 @@ function adjustWidth() {
}
.details {
padding: 20px;
padding: 15px 15px 15px 52px;
display: grid;
gap: 10px;
grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
@media (max-width: 767px) {
padding-left: 35px;
}
.details-item-title {
white-space: pre;
color: #909399;