From 5538d9b720294681fee769f1afe15162a8216b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=9F=E5=B8=85?= <133814250@qq.com>
Date: Tue, 8 Aug 2023 10:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=91=E5=88=97=E8=A1=A8=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/apply/notice/index.vue   |  2 +-
 web/src/views/home/message/message.vue |  8 ++--
 web/src/views/org/dept/dept.vue        | 11 ++++++
 web/src/views/permission/role/role.vue | 52 ++++++++++++++------------
 4 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/web/src/views/apply/notice/index.vue b/web/src/views/apply/notice/index.vue
index 49ffc80..6696da8 100644
--- a/web/src/views/apply/notice/index.vue
+++ b/web/src/views/apply/notice/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="n-layout-page-header">
       <n-card :bordered="false" title="通知公告">
-        在这里你可以发送通知、公告、私信到平台中的用户
+        在这里，您可以向平台中的用户发送通知、公告和私信消息
       </n-card>
     </div>
     <n-card :bordered="false" class="proCard">
diff --git a/web/src/views/home/message/message.vue b/web/src/views/home/message/message.vue
index b735479..547f571 100644
--- a/web/src/views/home/message/message.vue
+++ b/web/src/views/home/message/message.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="n-layout-page-header">
       <n-card :bordered="false" title="我的消息">
-        在这里你可以查看平台中通知、公告和与你相关的私信
+        在这里，您可以方便地查看平台中的通知、公告和与您相关的私信消息
       </n-card>
     </div>
     <n-card :bordered="false" class="proCard">
@@ -13,9 +13,9 @@
         animated
         @before-leave="handleBeforeLeave"
       >
-        <n-tab-pane name="1" tab="系统通知"> <List :type="defaultTab" /></n-tab-pane>
-        <n-tab-pane name="2" tab="系统公告"> <List :type="defaultTab" /> </n-tab-pane>
-        <n-tab-pane name="3" tab="私信消息"> <List :type="defaultTab" /> </n-tab-pane>
+        <n-tab-pane name="1" tab="通知"> <List :type="defaultTab" /></n-tab-pane>
+        <n-tab-pane name="2" tab="公告"> <List :type="defaultTab" /> </n-tab-pane>
+        <n-tab-pane name="3" tab="私信"> <List :type="defaultTab" /> </n-tab-pane>
       </n-tabs>
     </n-card>
   </div>
diff --git a/web/src/views/org/dept/dept.vue b/web/src/views/org/dept/dept.vue
index 1ba29e7..e04f48f 100644
--- a/web/src/views/org/dept/dept.vue
+++ b/web/src/views/org/dept/dept.vue
@@ -25,6 +25,7 @@
         </n-space>
 
         <n-data-table
+          v-if="data.length > 0 || !loading"
           :columns="columns"
           :data="data"
           :row-key="rowKey"
@@ -317,6 +318,10 @@
         return h(TableAction as any, {
           style: 'button',
           actions: [
+            {
+              label: '添加',
+              onClick: handleAddSub.bind(null, record),
+            },
             {
               label: '编辑',
               onClick: handleEdit.bind(null, record),
@@ -341,6 +346,12 @@
     optionsDefaultValue.value = 0;
   }
 
+  function handleAddSub(record: Recordable) {
+    showModal.value = true;
+    formParams.value = cloneDeep(defaultState);
+    optionsDefaultValue.value = record.id;
+  }
+
   function handleEdit(record: Recordable) {
     showModal.value = true;
     formParams.value = cloneDeep(record);
diff --git a/web/src/views/permission/role/role.vue b/web/src/views/permission/role/role.vue
index b566593..32dd6aa 100644
--- a/web/src/views/permission/role/role.vue
+++ b/web/src/views/permission/role/role.vue
@@ -1,20 +1,8 @@
 <template>
   <div>
-    <div class="n-layout-page-header">
-      <n-card :bordered="false" title="角色管理"> 在这里可以管理你权限下的角色权限</n-card>
-    </div>
-    <n-card :bordered="false" class="mt-4 proCard">
-      <BasicTable
-        :columns="columns"
-        :request="loadDataTable"
-        :row-key="(row) => row.id"
-        ref="actionRef"
-        :actionColumn="actionColumn"
-        @update:checked-row-keys="onCheckedRow"
-        :pagination="false"
-        :resizeHeightOffset="-20000"
-      >
-        <template #tableTitle>
+    <n-card :bordered="false"  title="角色管理">
+      <n-space vertical :size="12">
+        <n-space>
           <n-button type="primary" @click="addTable">
             <template #icon>
               <n-icon>
@@ -23,8 +11,18 @@
             </template>
             添加角色
           </n-button>
-        </template>
-      </BasicTable>
+        </n-space>
+
+        <n-data-table
+          v-if="data.length > 0 || !loading"
+          :columns="columns.concat(actionColumn)"
+          :data="data"
+          :row-key="(row) => row.id"
+          :loading="loading"
+          :resizeHeightOffset="-20000"
+          default-expand-all
+        />
+      </n-space>
     </n-card>
 
     <n-modal v-model:show="showModal" :show-icon="false" preset="dialog" :title="editRoleTitle">
@@ -155,8 +153,8 @@
 
 <script lang="ts" setup>
   import { h, onMounted, reactive, ref } from 'vue';
-  import { useDialog, useMessage } from 'naive-ui';
-  import { BasicColumn, BasicTable, TableAction } from '@/components/Table';
+  import { NButton, useDialog, useMessage } from 'naive-ui';
+  import { BasicColumn, TableAction } from '@/components/Table';
   import {
     Delete,
     Edit,
@@ -195,6 +193,8 @@
   const dataFormBtnLoading = ref(false);
   const showDataModal = ref(false);
   const dataForm = ref<any>();
+  const loading = ref(false);
+  const data = ref<any>([]);
 
   const rules = {
     name: {
@@ -270,12 +270,18 @@
   });
 
   const loadDataTable = async (res: any) => {
-    return await getRoleList({ ...res, ...{ pageSize: 100, page: 1 } });
+    loading.value = true;
+    const tmp = await getRoleList({ ...res, ...{ pageSize: 100, page: 1 } });
+    data.value = tmp?.list;
+    if (data.value === undefined || data.value === null) {
+      data.value = [];
+    }
+    loading.value = false;
   };
 
-  function onCheckedRow(rowKeys: any[]) {
-    console.log(rowKeys);
-  }
+  onMounted(async () => {
+    await loadDataTable({});
+  });
 
   function reloadTable() {
     actionRef.value.reload();