Kaynağa Gözat

修改 顯示權限名稱

maa3520 2 yıl önce
ebeveyn
işleme
7bccf8bc7d

+ 10 - 10
database/MAA.json

@@ -3310,52 +3310,52 @@
     },
     {
         "user_id": "northdept1",
-        "name": "北區",
+        "name": "北區1",
         "department_id": "xxx"
     },
     {
         "user_id": "northdept2",
-        "name": "北區",
+        "name": "北區2",
         "department_id": "xxx"
     },
     {
         "user_id": "northdept3",
-        "name": "北區",
+        "name": "北區3",
         "department_id": "xxx"
     },
     {
         "user_id": "northdept4",
-        "name": "北區",
+        "name": "北區4",
         "department_id": "xxx"
     },
     {
         "user_id": "centerdept1",
-        "name": "中區",
+        "name": "中區1",
         "department_id": "xxx"
     }, 
     {
         "user_id": "centerdept2",
-        "name": "中區",
+        "name": "中區2",
         "department_id": "xxx"
     }, 
     {
         "user_id": "centerdept3",
-        "name": "中區",
+        "name": "中區3",
         "department_id": "xxx"
     }, 
     {
         "user_id": "southdept1",
-        "name": "南區",
+        "name": "南區1",
         "department_id": "xxx"
     }, 
     {
         "user_id": "southdept2",
-        "name": "南區",
+        "name": "南區2",
         "department_id": "xxx"
     }, 
     {
         "user_id": "southdept3",
-        "name": "南區",
+        "name": "南區3",
         "department_id": "xxx"
     }, 
     {

+ 0 - 8
database/seeders/PrizeSeeder.php

@@ -17,14 +17,6 @@ class PrizeSeeder extends Seeder
     {
         Prize::truncate();
         Prize::insert([
-            [
-                'activity_id' => '1',
-                'name' => '普獎現金 1,200 元',
-                'provider' => '亞新',
-                'count' => 0,
-                'created_at' => now(),
-                'updated_at' => now(),
-            ],
             [
                 'activity_id' => '1',
                 'name' => '現金 16,800 元',

+ 7 - 1
resources/js/src/@core/layouts/components/app-navbar/components/UserDropdown.vue

@@ -9,7 +9,7 @@
         <p class="user-name font-weight-bolder mb-0">
           {{ userData.fullName || userData.username }}
         </p>
-        <span class="user-status">{{ userData.role }}</span>
+        <span class="user-status">{{ roleConverter(userData.role) }}</span>
       </div>
       <b-avatar
         size="40"
@@ -128,6 +128,8 @@ import { initialAbility } from '@/libs/acl/config'
 import useJwt from '@/auth/jwt/useJwt'
 import { avatarText } from '@core/utils/filter'
 
+const roleList = [{'Admin':'管理員'},{'User':'一般用戶'},{'Checkin':'工作人員'},{'Draw':'主持人'},{'Guest':'來賓'}];
+
 export default {
   components: {
     BNavItemDropdown,
@@ -157,6 +159,10 @@ export default {
       // Redirect to login page
       this.$router.push({ name: 'login' })
     },
+    roleConverter(role){
+      
+      return roleList[role];
+    },
   },
 }
 </script>

+ 6 - 1
resources/js/src/layouts/components/Navbar.vue

@@ -29,7 +29,7 @@
             <p class="user-name font-weight-bolder mb-0">
               {{ (userData && userData.name) || "來賓帳戶" }}
             </p>
-            <span class="user-status">{{ (userData && userData.role) || "Guest" }}</span>
+            <span class="user-status">{{ (userData && roleConverter(userData.role)) }}</span>
           </div>
           <b-avatar
             size="40"
@@ -102,6 +102,8 @@ import useJwt from '@/auth/jwt/useJwt'
 import { getUserData } from '@/auth/utils'
 import { avatarText } from '@core/utils/filter'
 import { defineRulesFor } from '@/libs/acl/ability'
+const roleList = { 'Admin': '管理員', 'User': '一般用戶', 'Checkin': '工作人員', 'Draw': '主持人', 'Guest': '來賓帳戶' };
+
 export default {
   components: {
     BLink,
@@ -146,6 +148,9 @@ export default {
 
 
 
+    },
+    roleConverter(role) {
+        return roleList[role];
     },
   }, computed: {
     makeAvatorLink() {