Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container panel">
     <!-- 顶部统计面板 -->
     <el-row :gutter="40" class="panel-group">
       <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
@@ -49,7 +49,7 @@
     </el-row>
 
     <!-- 中间图表区域 -->
-    <el-row :gutter="32" style="margin-bottom: 32px;">
+    <el-row :gutter="32" style="margin-bottom: 0px;">
       <el-col :xs="24" :sm="24" :lg="16">
         <div class="chart-wrapper">
           <div class="chart-header">
@@ -221,6 +221,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.panel{
+  background: #fafafa;
+}
 .panel-group {
   margin-top: 18px;
 

ruoyi-ui/src/views/system/role/index.vue

@@ -308,8 +308,17 @@
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"
+import {
+  addRole,
+  changeRoleStatus,
+  dataScope,
+  delRole,
+  deptTreeSelect,
+  getRole,
+  listRole,
+  updateRole
+} from "@/api/system/role"
+import {roleMenuTreeselect, treeselect as menuTreeselect} from "@/api/system/menu"
 import {listWarehouse} from "@/api/bas/warehouse"
 
 export default {
@@ -436,9 +445,9 @@ export default {
         // let listMenu = response.data.map(item => {
         //     return this.$t(item.label); // 只提取翻译后的 label
         // });
-        const translatedData = this.translateMenuLabels(response.data);
+        console.log(response.data);
         // this.menuOptions = response.data
-        this.menuOptions = translatedData
+        this.menuOptions = this.translateMenuLabels(response.data)
       })
     },
     //@@@