Browse Source

fix:工作台样式

fix:重置密码
youhua/chongzhi
lihui 2 months ago
parent
commit
2223d6eec2
  1. 4
      src/views/permissions/userPermission.vue
  2. 7
      src/views/workspace/index.vue

4
src/views/permissions/userPermission.vue

@ -781,9 +781,9 @@ const confirmResetPassword = async function () {
//
if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部') {
if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部') {
console.log('符合条件,可以操作', adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部');
console.log('符合条件,可以操作', adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部');
const params = {
account: currentRow.value.account,
}

7
src/views/workspace/index.vue

@ -19,7 +19,8 @@
<template #header>
<div class="card-header">
<div class="card-title">当前金币余量</div>
<div>{{ currentGold / 100 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;较前一日
<div>
<span style="font-weight: bold">{{ currentGold / 100 }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;较前一日
{{ dailyChange / 100 }}
<template v-if="dailyChange > 0">
<el-icon style="color:red">
@ -314,8 +315,8 @@ const getToday = function () {
//
const getWeek = function () {
const today = dayjs()
const startTime = (today.startOf('week').add(1, 'day')).format('YYYY-MM-DD HH:mm:ss')
const endTime = (today.endOf('week').add(1, 'day')).format('YYYY-MM-DD HH:mm:ss')
const startTime = (today.startOf('week').format('YYYY-MM-DD HH:mm:ss'))
const endTime = today.endOf('week').format('YYYY-MM-DD HH:mm:ss')
// const endTime = today.add(1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)

Loading…
Cancel
Save