[fix] 管理者画面の閲覧状態を権限によって制御(#1476)

NUTFes · May 6, 2024 · 6aacd60 · 6aacd60
1 parent fa15ac9
commit 6aacd60
Show file tree

Hide file tree

Showing 47 changed files with 1,122 additions and 451 deletions.
diff --git a/admin_view/nuxt-project/components/AccountModal.vue b/admin_view/nuxt-project/components/AccountModal.vue
@@ -8,9 +8,12 @@
             <slot></slot>
           </Row>
           <h6 v-if="user.role_id == 1" class="developer">Developer</h6>
-          <h6 v-if="user.role_id == 2">Manager</h6>
-          <h6 v-if="user.role_id == 3">User</h6>
-          <h6 v-if="user.role_id == 4">Member</h6>
+          <h6 v-if="user.role_id == 2" class="participant">Participant</h6>
+          <h6 v-if="user.role_id == 3" class="inventory_management">Inventory_Management</h6>
+          <h6 v-if="user.role_id == 4" class="venue_power">Venue_Power</h6>
+          <h6 v-if="user.role_id == 5" class="sanitation_management">Sanitation_Management</h6>
+          <h6 v-if="user.role_id == 6" class="staff">Staff</h6>
+          <h6 v-if="user.role_id == 7" class="user">User</h6>
           <h3>{{ user.name }}</h3>
           <p>{{ user.email }}</p>
           <IconButton icon_name="edit" :on_click="openEditModal" />

diff --git a/admin_view/nuxt-project/components/UsersCard.vue b/admin_view/nuxt-project/components/UsersCard.vue
@@ -10,13 +10,22 @@
           >{{ dashboardData.developer_num }} Developers</Tag
         >
         <Tag primaryColor="#8FEE8D" secondaryColor="#E3D08A"
-          >{{ dashboardData.manager_num }} Managers</Tag
+          >{{ dashboardData.participant_num }} Participants</Tag
         >
         <Tag primaryColor="#9C8AE3" secondaryColor="#70FFDD"
-          >{{ dashboardData.user_num }} Users</Tag
+          >{{ dashboardData.inventory_management_num }} Inventory_Managers</Tag
+        >
+        <Tag primaryColor="#ffce56" secondaryColor="#d6ff33"
+          >{{ dashboardData.venue_power_num }} Venue_Power_Managers</Tag
+        >
+        <Tag primaryColor="#ffce56" secondaryColor="#d6ff33"
+          >{{ dashboardData.sanitation_management_num }} Sanitation_Managers</Tag
+        >
+        <Tag primaryColor="#ffce56" secondaryColor="#d6ff33"
+          >{{ dashboardData.staff_num }} Staffs</Tag
         >
         <Tag primaryColor="#ffce56" secondaryColor="#d6ff33"
-          >{{ dashboardData.member_num }} Members</Tag
+          >{{ dashboardData.user_num }} Users</Tag
         >
       </Row>
     </div>

diff --git a/admin_view/nuxt-project/pages/adjustment_order_items/index.vue b/admin_view/nuxt-project/pages/adjustment_order_items/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content"  v-if="this.$role(roleID).stocker_places.read">
     <SubHeader pageTitle="物品申請数調整">
       <CommonButton v-if="this.$role(roleID).stocker_places.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -85,6 +85,7 @@
       </template>
     </AddModal>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/adjustment_rental_time/index.vue b/admin_view/nuxt-project/pages/adjustment_rental_time/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).stocker_places.read">
     <SubHeader pageTitle="物品貸出 時間・人数調整">
       <CommonButton v-if="this.$role(roleID).stocker_places.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -85,6 +85,7 @@
       </template>
     </AddModal>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/announcement/index.vue b/admin_view/nuxt-project/pages/announcement/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content"  v-if="this.$role(roleID).announcements.read">
     <SubHeader pageTitle="会場アナウンス文申請一覧">
       <CommonButton
         v-if="this.$role(roleID).announcements.create"
@@ -98,6 +98,7 @@
       {{ snackMessage }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/assign_item_movements/index.vue b/admin_view/nuxt-project/pages/assign_item_movements/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).stocker_places.read">
     <SubHeader pageTitle="物品移動計画">
       <CommonButton v-if="this.$role(roleID).stocker_places.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -105,6 +105,7 @@
       </template>
     </AddModal>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/assign_items/index.vue b/admin_view/nuxt-project/pages/assign_items/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).stocker_places.read">
     <SubHeader pageTitle="在庫場所">
       <CommonButton v-if="this.$role(roleID).stocker_places.create" iconName="add_circle" :on_click="openAddModal">
         追加   
@@ -72,6 +72,7 @@
       </template>
     </AddModal>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/assign_places/index.vue b/admin_view/nuxt-project/pages/assign_places/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).places.read">
     <SubHeader pageTitle="会場割り当て">
     </SubHeader>
 
@@ -127,12 +127,15 @@
     </AddModal>
 
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
+
 </template>
 
 <script>
 import AddModal from '../../components/AddModal.vue';
 import CommonButton from '../../components/CommonButton.vue';
 import Column from '../../components/Column.vue';
+import { mapState } from "vuex";
 export default {
   components: { AddModal, CommonButton, Column },
   data() {
@@ -181,6 +184,11 @@ export default {
       refYears: currentYears[0].year_num,
   };
   },
+  computed: {
+    ...mapState({
+      roleID: (state) => state.users.role,
+    }),
+  },
   methods: {
     openAddModal() {
       this.$axios.$get("/places").then((res) => {

diff --git a/admin_view/nuxt-project/pages/assign_stages/index.vue b/admin_view/nuxt-project/pages/assign_stages/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).stages.read">
     <SubHeader pageTitle="ステージ割り当て">
     </SubHeader>
 
@@ -128,11 +128,13 @@
     </AddModal>
 
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>
 import AddModal from '../../components/AddModal.vue';
 import CommonButton from '../../components/CommonButton.vue';
+import { mapState } from "vuex";
 export default {
   components: { AddModal, CommonButton },
   data() {
@@ -182,6 +184,11 @@ export default {
       refYears: currentYears[0].year_num,
     };
   },
+  computed: {
+    ...mapState({
+      roleID: (state) => state.users.role,
+    }),
+  },
   methods: {
     openAddModal() {
       this.$axios.$get("/stages").then((res) => {

diff --git a/admin_view/nuxt-project/pages/employees/index.vue b/admin_view/nuxt-project/pages/employees/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).employees.read">
     <SubHeader pageTitle="従業員申請">
       <CommonButton v-if="this.$role(roleID).employees.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -108,6 +108,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/food_products/index.vue b/admin_view/nuxt-project/pages/food_products/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).food_products.read">
     <SubHeader pageTitle="販売食品申請一覧">
       <CommonButton v-if="this.$role(roleID).food_products.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -128,6 +128,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/group_identify/index.vue b/admin_view/nuxt-project/pages/group_identify/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).group_identify.read">
     <SubHeader pageTitle="識別番号" />
     <SubSubHeader>
       <template v-slot:refinement>
@@ -82,9 +82,11 @@
       </template>
     </AddModal>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>
+import { mapState } from "vuex";
 export default {
   data() {
     return {
@@ -132,6 +134,11 @@ export default {
       refYears: currentYears[0].year_num,
     };
   },
+  computed: {
+    ...mapState({
+      roleID: (state) => state.users.role,
+    }),
+  },
   methods: {
     openAddModal(id, groupId, name, number) {
       this.targetId = id

diff --git a/admin_view/nuxt-project/pages/groups/index.vue b/admin_view/nuxt-project/pages/groups/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).groups.read">
     <SubHeader pageTitle="参加団体申請一覧">
       <CommonButton v-if="this.$role(roleID).groups.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -133,6 +133,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/news/index.vue b/admin_view/nuxt-project/pages/news/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).news.read">
     <SubHeader pageTitle="お知らせ一覧">
       <CommonButton v-if="this.$role(roleID).news.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -61,6 +61,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/place_orders/index.vue b/admin_view/nuxt-project/pages/place_orders/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).place_orders.read">
     <SubHeader pageTitle="会場申請一覧">
       <CommonButton v-if="this.$role(roleID).place_orders.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -156,6 +156,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/places/index.vue b/admin_view/nuxt-project/pages/places/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).places.read">
     <SubHeader pageTitle="会場一覧">
       <CommonButton v-if="this.$role(roleID).places.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -55,6 +55,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/power_orders/index.vue b/admin_view/nuxt-project/pages/power_orders/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content" v-if="this.$role(roleID).power_orders.read">
     <SubHeader pageTitle="電力申請一覧">
       <CommonButton v-if="this.$role(roleID).power_orders.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -125,6 +125,7 @@
       {{ message }}
     </SnackBar>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
 </template>
 
 <script>

diff --git a/admin_view/nuxt-project/pages/print/index.vue b/admin_view/nuxt-project/pages/print/index.vue
@@ -3,7 +3,7 @@
     <SubHeader pageTitle="書類印刷"></SubHeader>
     <Card width="100%">
       <VerticalTable>
-        <tr>
+        <tr v-if="this.$role(roleID).power_orders.read">
           <td>使用電力リスト</td>
           <td>
             <InTableButton iconName="file_download" :on_click="downloadPowerPDF"
@@ -14,7 +14,7 @@
             </InTableButton>
           </td>
         </tr>
-        <tr>
+        <tr v-if="this.$role(roleID).employees.read">
           <td>従業員リスト</td>
           <td>
             <InTableButton
@@ -27,7 +27,7 @@
             </InTableButton>
           </td>
         </tr>
-        <tr>
+        <tr v-if="this.$role(roleID).rental_items.read">
           <td>貸出物品リストまとめ</td>
           <td>
             <InTableButton
@@ -40,7 +40,7 @@
             </InTableButton>
           </td>
         </tr>
-        <tr>
+        <tr v-if="this.$role(roleID).food_products.read">
           <td>販売食品リスト</td>
           <td>
             <InTableButton
@@ -53,7 +53,7 @@
             </InTableButton>
           </td>
         </tr>
-        <tr>
+        <tr v-if="this.$role(roleID).groups.read">
           <td>連絡先リスト</td>
           <td>
             <InTableButton
@@ -66,7 +66,7 @@
             </InTableButton>
           </td>
         </tr>
-        <tr>
+        <tr v-if="this.$role(roleID).groups.read">
           <td>参加団体情報リストまとめ</td>
           <td>
             <InTableButton
@@ -79,7 +79,7 @@
             </InTableButton>
           </td>
         </tr>
-        <tr>
+        <tr v-if="this.$role(roleID).rental_items.read">
           <td>物品貸出表</td>
           <td>
             <InTableButton

diff --git a/admin_view/nuxt-project/pages/project_names/index.vue b/admin_view/nuxt-project/pages/project_names/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-content">
+  <div class="main-content"  v-if="this.$role(roleID).project_names.read">
     <SubHeader pageTitle="企画名申請一覧">
       <CommonButton v-if="this.$role(roleID).project_names.create" iconName="add_circle" :on_click="openAddModal">
         追加
@@ -11,6 +11,8 @@
     </SubSubHeader>
     <Card width="100%"> </Card>
   </div>
+  <h1 v-else>閲覧権限がありません</h1>
+
 </template>
 
 <script>