From 2223d6eec200e57d8fadfa840582ae88a82614b2 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 20 Aug 2025 14:51:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20fix:=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/userPermission.vue | 4 ++--
 src/views/workspace/index.vue            | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 82fe215..887d76c 100644
--- a/src/views/permissions/userPermission.vue
+++ b/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,
     }
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 1992659..90ae110 100644
--- a/src/views/workspace/index.vue
+++ b/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)