Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化

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)">

src/views/workspace/index.vue

@@ -125,12 +125,12 @@
         </el-tabs>
       </div>
       <div class="condition">
-        <div style="width:44%;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="width:24%;background-color: aqua;">
+        <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="width:31%;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%;