#

luxiaotao1123

2024-02-23 f579ec9f3a980495298743075761e22ee44647d8

#

 zy-asrs-flow/src/global.less

@@ -1,3 +1,7 @@
:root {
  --scrollbar-thumb-color: rgba(128, 128, 128, .5);
}

html,
body,
#root {
@@ -16,6 +20,7 @@
.ant-layout {
  min-height: 100vh;
}

.ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed {
  left: unset;
}
@@ -35,19 +40,38 @@
  list-style: none;
}

::-webkit-scrollbar {
  width: 6px;
  height: 7px;
  background-color: transparent;
}

::-webkit-scrollbar-thumb {
  background-color: var(--scrollbar-thumb-color);
  border-radius: 5px;
}

::-webkit-scrollbar-track {
  background-color: transparent;
  border-radius: 5px;
}

@media (max-width: 768px) {
  .ant-table {
    width: 100%;
    overflow-x: auto;
    &-thead > tr,
    &-tbody > tr {
      > th,
      > td {

    &-thead>tr,
    &-tbody>tr {

      >th,
      >td {
        white-space: pre;
        > span {

        >span {
          display: block;
        }
      }
    }
  }
}
}

 zy-asrs-flow/src/pages/system/operationRecord/index.jsx

@@ -175,7 +175,7 @@
        {
            title: '请求内容',
            dataIndex: 'request',
            valueType: 'text',
            valueType: 'code',
            hidden: false,
            width: 140,
            filterDropdown: (props) => <TextFilter
@@ -188,7 +188,7 @@
        {
            title: '响应内容',
            dataIndex: 'response',
            valueType: 'text',
            valueType: 'code',
            hidden: false,
            width: 140,
            filterDropdown: (props) => <TextFilter

 zy-asrs-flow/src/pages/system/role/index.jsx

@@ -139,6 +139,23 @@
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
            render: (_, record) => {
                return (
                    <a
                        onClick={() => {
                            Http.doGetPromise('/api/role/scope/list', { roleId: record.id }, (res) => {
                                if (res.data) {
                                    setMenuIds(res.data);
                                }
                                setScopeModalVisible(true);
                                setCurrentRow(record);
                            });
                        }}
                    >
                        {_}
                    </a>
                );
            },
        },
        {
            title: '标识',
@@ -210,21 +227,21 @@
                >
                    编辑
                </Button>,
                 <Button
                 type="link"
                 key="scope"
                 onClick={() => {
                     Http.doGetPromise('/api/role/scope/list', { roleId: record.id }, (res) => {
                         if (res.data) {
                             setMenuIds(res.data);
                         }
                         setScopeModalVisible(true);
                         setCurrentRow(record);
                     });
                 }}
             >
                 分配权限
             </Button>,
                <Button
                    type="link"
                    key="scope"
                    onClick={() => {
                        Http.doGetPromise('/api/role/scope/list', { roleId: record.id }, (res) => {
                            if (res.data) {
                                setMenuIds(res.data);
                            }
                            setScopeModalVisible(true);
                            setCurrentRow(record);
                        });
                    }}
                >
                    分配权限
                </Button>,
                <Button
                    type="link"
                    danger

 zy-asrs-flow/src/pages/system/user/index.jsx

@@ -158,6 +158,44 @@
            width: 30,
        },
        {
            title: '部门',
            dataIndex: 'deptId$',
            valueType: 'text',
            hidden: false,
            width: 100,
            render: (_, record) => {
                if (_ && _ !== '-') {
                    return <Tag color={""}>{_}</Tag>
                } else {
                    return '-'
                }
            },
            // filterDropdown: (props) => <LinkFilter
            //     name='deptId'
            //     major='dept'
            //     {...props}
            //     actionRef={actionRef}
            //     setSearchParam={setSearchParam}
            // />,
        },
        {
            title: '登录账号',
            dataIndex: 'username',
            valueType: 'text',
            hidden: false,
            copyable: true,
            width: 100,
            filterDropdown: (props) => <TextFilter
                name='username'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
            render: (_, record) => {
                return <span style={{ fontWeight: "bold" }}>{_}</span>
            }
        },
        {
            title: '名称',
            dataIndex: 'nickname',
            valueType: 'text',
@@ -169,19 +207,9 @@
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
        },
        {
            title: '登录账号',
            dataIndex: 'username',
            valueType: 'text',
            hidden: false,
            width: 100,
            filterDropdown: (props) => <TextFilter
                name='username'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
            render: (_, record) => {
                return <span style={{ fontWeight: "bold" }}>{_}</span>
            }
        },
        {
            title: '密码',
@@ -244,7 +272,7 @@
            title: '手机号',
            dataIndex: 'phone',
            valueType: 'text',
            hidden: false,
            hidden: true,
            width: 100,
            filterDropdown: (props) => <TextFilter
                name='phone'
@@ -283,27 +311,21 @@
                ]}
            />,
        },
        {
            title: '所属部门',
            dataIndex: 'deptId$',
            valueType: 'text',
            hidden: false,
            width: 100,
            render: (_, record) => {
                if (_ && _ !== '-') {
                    return <Tag color={""}>{_}</Tag>
                } else {
                    return '-'
                }
            },
            // filterDropdown: (props) => <LinkFilter
            //     name='deptId'
            //     major='dept'
            //     {...props}
            //     actionRef={actionRef}
            //     setSearchParam={setSearchParam}
            // />,
        },
        // {
        //     title: '角色',
        //     valueType: 'text',
        //     hidden: false,
        //     width: 100,
        //     render: (_, record) => {
        //         if (record.roleIds && record.roleIds.length > 0) {
        //             Http.doGetPromise('api/role/list/name/' + record.roleIds.join(','), null, (res) => {
        //                 return '-'
        //             });
        //         } else {
        //             return '-'
        //         }
        //     },
        // },
        {
            title: '真实姓名',
            dataIndex: 'realName',

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java

@@ -162,4 +162,14 @@
        return R.ok("分配成功");
    }

    @PreAuthorize("hasAuthority('system:role:list')")
    @GetMapping("/role/list/name/{ids}")
    public R listName(@PathVariable Long[] ids) {
        List<String> nameList = new ArrayList<>();
        for (Long id : ids) {
            nameList.add(roleService.getById(id).getName());
        }
        return R.ok().add(nameList);
    }

}