From a3b0fa1d50a645524fd9367ced3d7366d28ec0cd Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Fri, 22 Aug 2025 17:52:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workspace/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index bbf0f6f..eab370c 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -125,12 +125,12 @@
         </el-tabs>
       </div>
       <div class="condition">
-        <div style="width:44%;background-color: antiquewhite;">合计&nbsp;
+        <div style="background-color: antiquewhite;">合计&nbsp;
           永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
           免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
           任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}
         </div>
-        <div @change="handleDatePickerChange" style="width:24%;background-color: aqua;">
+        <div @change="handleDatePickerChange" style="background-color: aqua;margin-left:auto;margin-right: 0.5%;">
           <el-button @click="getYes()" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天
           </el-button>
           <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今天
@@ -142,7 +142,7 @@
           <el-button @click="getYear()" :type="activeTimeRange === 'year' ? 'primary' : ''">本年
           </el-button>
         </div>
-        <div style="width:31%;background-color: bisque;">
+        <div style="background-color: bisque;">
           <el-date-picker v-model="dateRange" type="datetimerange" range-separator="→" start-placeholder="开始时间"
             end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" style="width:20vw" value-format="YYYY-MM-DD HH:mm:ss"
             :default-time="defaultTime" :disabled-date="disabledDate" />

From 6467769a1caaaf8124f6a90017026f8409d9a226 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Fri, 22 Aug 2025 18:02:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0=E4=B8=8A=E7=BA=A7=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index 8f1d657..2c89110 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/src/views/permissions/rolePermission.vue
@@ -608,7 +608,11 @@ onMounted(async function () {
           </el-table-column>
 
           <el-table-column prop="roleName" label="角色名称" />
-          <el-table-column prop="fatherName" label="上级角色" />
+          <el-table-column prop="fatherName" label="上级角色" >
+            <template #default="scope">
+              {{ scope.row.fatherName || '-' }}
+            </template>
+          </el-table-column>
           <el-table-column label="权限范围" show-overflow-tooltip>
             <template #default="scope">
               <div class="permission-cell" @click="showMenuTree(scope.row.tree, scope.row.roleName)">
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index eab370c..58fe480 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -125,12 +125,12 @@
         </el-tabs>
       </div>
       <div class="condition">
-        <div style="background-color: antiquewhite;">合计&nbsp;
+        <div>合计&nbsp;
           永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
           免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
           任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}
         </div>
-        <div @change="handleDatePickerChange" style="background-color: aqua;margin-left:auto;margin-right: 0.5%;">
+        <div @change="handleDatePickerChange" style="margin-left:auto;margin-right: 0.5%;">
           <el-button @click="getYes()" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天
           </el-button>
           <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今天
@@ -142,7 +142,7 @@
           <el-button @click="getYear()" :type="activeTimeRange === 'year' ? 'primary' : ''">本年
           </el-button>
         </div>
-        <div style="background-color: bisque;">
+        <div>
           <el-date-picker v-model="dateRange" type="datetimerange" range-separator="→" start-placeholder="开始时间"
             end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" style="width:20vw" value-format="YYYY-MM-DD HH:mm:ss"
             :default-time="defaultTime" :disabled-date="disabledDate" />
@@ -811,7 +811,6 @@ onUnmounted(() => {
   width: 100%;
   display: flex;
   height: 64%;
-  background-color: aqua;
 
   .condition {
     width: 100%;