Merge branch 'feature/shuiluo' into 'master'

Feature/shuiluo

See merge request product/kim3-web-vue/starter-web-vue!15

README.md

@@ -30,3 +30,12 @@ $ npm run serve
 
  css 工具函数 地址
  https://www.tailwindcss.cn/docs/installation#post-css-7
+
+已完成：
+1、菜单增删改
+
+
+问题：
+1、通知接口 404 导致后续没开发了
+2、角色，新增，修改， functionAuthority 菜单权限这个字段不知道怎么传
+3、系统日志，没发现api，之前系统也没页面。不知道怎么搞

src/api/menu.js

@@ -4,17 +4,34 @@ export function delMenuApi(id) {
     return delReq(`/api/v1/menus/${id}`);
 }
 
-export function getMenuDataApi() {
-    return getReq('/api/v1/menus');
+/**
+ * 缓存下，菜单变化的可能性比较小
+ */
+let menus = [];
+export async function getMenuDataApi(useCache) {
+    if (menus.length && useCache) return menus;
+    return getReq('/api/v1/menus').then(res => {
+        menus = res;
+        return res;
+    });
 }
 
 export function addMenuApi(data) {
     return postReq('/api/v1/menus', data);
 }
 
+export function updateMenuApi(data) {
+    return putReq('/api/v1/menus', data);
+}
+
 export function addRoleApi(data) {
     return postReq('/api/v1/roles', data);
 }
+
+export function getRoleApi(id) {
+    return getReq(`/api/v1/roles/${id}`);
+}
+
 export function updateRoleApi(data) {
     return putReq('/api/v1/roles', data);
 }

src/components/menu_tree/index.vue

@@ -7,6 +7,7 @@
         :tree-data="treeData"
         style="max-height:400px"
         class="tw-overflow-y-auto"
+        :expandedKeys.sync="expandedKeys"
         v-bind="$attrs"
         v-on="$listeners"
     />
@@ -24,6 +25,7 @@ export default {
     props: {
         value: [Object, Array],
         showMenu: Boolean,
+        defaultCheckedKeys: Array,
     },
     data() {
         return {
@@ -32,11 +34,22 @@ export default {
                 title: 'menuName',
                 key: 'menuId',
             },
+            expandedKeys: [],
         };
     },
     async mounted() {
-        this.rawData = await getMenuDataApi();
+        // 使用 缓存
+        this.rawData = await getMenuDataApi(true);
         this.treeData = convertListToTree(this.rawData, !this.showMenu);
+        this.$emit('check', this.defaultCheckedKeys);
+        this.expandedKeys = this.defaultCheckedKeys;
+    },
+
+    watch: {
+        defaultCheckedKeys(val) {
+            this.$emit('check', val);
+            this.expandedKeys = val;
+        },
     },
 
     methods: {

src/components/menu_tree/select.vue

@@ -34,7 +34,6 @@ export default {
     },
     async mounted() {
         this.treeData = convertListToTree(await getMenuDataApi(), true);
-        console.log(this.treeData);
     },
 };
 </script>

src/components/table/index.vue

@@ -125,7 +125,7 @@ export default {
     },
     watch: {
         addVisible(val) {
-            if (!val && this.addBtn.onCancel) this.addBtn.onCancel();
+            if (!val && this?.addBtn?.onCancel) this.addBtn.onCancel();
         },
     },
     mounted() {
@@ -140,6 +140,7 @@ export default {
                       current: this.initQuery.pageNum,
                       pageSize: this.initQuery.pageSize,
                       total: this.total,
+                      showQuickJumper: true,
                   };
         },
         isRowSelection() {

src/config/setting.config.js

@@ -18,8 +18,8 @@ const settingConfig = {
     multiPage: true, //多页签模式，true:开启，false:不开启
     cachePage: true, //是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
     hideSetting: false, //隐藏设置抽屉，true:隐藏，false:不隐藏
-    systemCode: "Akina", //系统编码
-    systemName: "Akina Antd Vue Pro", //系统名称
+    systemCode: "Karot", //系统编码
+    systemName: "Karot文档管理系统", //系统名称
     copyright: "2021~ C.T 工作室出品", //copyright
     asyncRoutes: false, //异步加载路由，true:开启，false:不开启
     showPageTitle: true, //是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示

src/pages/system/view/log/operation/index.vue

@@ -21,8 +21,8 @@
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                 />
             </my-form-item>
-            <my-form-item label="登录用户">
-                <a-input v-model="query.userId" />
+            <my-form-item label="操作用户Id">
+                <a-input v-model="query.operatorId" />
             </my-form-item>
             <my-form-item label="业务模块">
                 <a-select v-model="query.loginType" allowClear>
@@ -61,9 +61,6 @@ export default {
         };
     },
     methods: {
-        refreshTable() {
-            this.$refs.table.getData();
-        },
         showDrawer(type, noFooter) {
             this.$refs['table'].show({ type, noFooter });
         },

src/pages/system/view/menu/MenuManagement.vue

@@ -55,7 +55,7 @@ export default {
         edit(data) {
             this.$refs['table']?.show({ type: 1 });
             this.$nextTick(() => {
-                this.$refs['addForm'].setEdit(data);
+                this.$refs['addForm'].setEdit({ ...data });
             });
         },
     },

src/pages/system/view/menu/form.vue

@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { addMenuApi } from '@/api';
+import { addMenuApi, updateMenuApi } from '@/api';
 import MenuTree from '@/components/menu_tree/select.vue';
 
 export default {
@@ -58,7 +58,8 @@ export default {
     methods: {
         async submit() {
             await this.$refs['form'].validate();
-            return addMenuApi({ ...this.form, parentMenuId: this.form.parentMenuId ?? 0 });
+            const reqData = { ...this.form, parentMenuId: this.form.parentMenuId ?? 0 };
+            return this.isEdit ? updateMenuApi(reqData) : addMenuApi(reqData);
         },
         setEdit(data) {
             this.type = 1;

src/pages/system/view/role/RoleManagement.vue

@@ -34,7 +34,7 @@ export default {
             this.$refs['table']?.getData();
         },
         view(data, type) {
-            this.$refs['table']?.show({ type });
+            this.$refs['table']?.show({ type, noFooter: type === 2 });
             this.$nextTick(() => {
                 this.$refs['form'].setData({ ...data }, type);
             });

src/pages/system/view/role/form.vue

@@ -11,15 +11,21 @@
         </a-form-model-item>
 
         <a-form-model-item label="菜单权限">
-            <MenuTree v-model="checkedKeys" showMenu ref="menuTree" :disabled="isView" />
+            <MenuTree
+                v-model="checkedKeys"
+                :defaultCheckedKeys="defaultCheckedKeys"
+                showMenu
+                ref="menuTree"
+                :disabled="isView"
+            />
         </a-form-model-item>
     </a-form-model>
 </template>
 
 <script>
 import MenuTree from '@/components/menu_tree/index.vue';
+import { addRoleApi, getRoleApi, updateRoleApi } from '@/api';
 import FormMixin from '@/components/FormMixin';
-import { addRoleApi, updateRoleApi } from '@/api';
 
 export default {
     mixins: [FormMixin],
@@ -29,17 +35,23 @@ export default {
             form: {},
             rules: {},
             checkedKeys: [],
+            defaultCheckedKeys: [],
         };
     },
     computed: {},
     methods: {
-        add() {
-            console.log(1);
-            return addRoleApi({ ...this.form, authorityList: this.$refs['menuTree'].get() });
+        submit() {
+            const query = { ...this.form, functionAuthority: this.checkedKeys.map(i => i.toString()) };
+            return this.isEdit ? updateRoleApi(query) : addRoleApi(query);
         },
-        edit() {
-            console.log(1);
-            return updateRoleApi({ ...this.form, authorityList: this.$refs['menuTree'].get() });
+        setData(data, type) {
+            this.getData(data.roleId);
+            this.type = type;
+        },
+        async getData(id) {
+            const res = await getRoleApi(id);
+            this.form = res;
+            this.defaultCheckedKeys = res.menuComponentKeys.map(i => parseInt(i.split('-')[0]));
         },
     },
 };

src/pages/system/view/user/UserManagement.vue

-<template>
-    <my-table url="table" addBtn="addBtn">
-        <template #search="{query}">
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-        </template>
-        <template #add>
-            <a-input v-model="add.name" />
-        </template>
-        <a-table-column title="姓名" data-index="name" />
-        <a-table-column title="操作">
-            <template #default="row">
-                <span>
-                    <a> {{ row }}</a>
-                    <a-divider type="vertical" />
-                    <a>Delete</a>
-                </span>
-            </template>
-        </a-table-column>
-    </my-table>
-</template>
-
-<script>
-export default {
-    data: () => ({
-        add: {},
-        addBtn: {},
-    }),
-};
-</script>

src/pages/system/view/user/index.js

-import UserManagement from './UserManagement';
-
-export default UserManagement;
\ No newline at end of file

src/pages/user/components/info.vue

@@ -54,6 +54,16 @@ export default {
             return this.form.userAvatar ? `${this.$fileUrl}${this.form.userAvatar}` : null;
         },
     },
+    mounted() {
+        if (this.loginId) {
+            const userInfo = this.$store.state.userInfo;
+            this.form.userName = userInfo.userName;
+            this.form.fixedPhone = userInfo.fixedPhone;
+            this.form.mobilePhone = userInfo.mobilePhone;
+            this.form.userEmail = userInfo.userEmail;
+            this.form.userAvatar = userInfo.userAvatar;
+        }
+    },
     watch: {
         '$store.state.userInfo'(userInfo) {
             this.form.userName = userInfo.userName;

src/pages/user/components/message.vue

 <template>
-    <h1>消息仲系</h1>
+    <my-table url="/api/v1/messages/notice">
+        <a-table-column title="标题" data-index="noticeTitle" />
+        <a-table-column title="内容" data-index="noticeContent" />
+        <a-table-column title="创建时间" data-index="createTime"  />
+        <a-table-column title="发送者" data-index="noticeSenderName" />
+        <a-table-column title="接受者" data-index="noticeReceiverName" />
+        <a-table-column title="是否已读" data-index="isReadName" />
+        <a-table-column title="已读时间" data-index="readTime" />
+    </my-table>
 </template>

src/router/async/router.map.js

@@ -54,18 +54,5 @@ const routerMap = {
         name: '菜单管理',
         component: () => import('@/pages/system/view/menu'),
     },
-    user_management: {
-        name: '用户管理',
-        component: () => import('@/pages/system/view/user'),
-    },
-    role_management: {
-        name: '角色管理',
-        component: () => import('@/pages/system/view/role'),
-    },
-
-    // log_management: {
-    //     name: '日志管理',
-    //     component: () => import('@/pages/system/view/log'),
-    // },
 };
 export default routerMap;