forked from gzzfw/frontEnd/gzDyh

dminyi
2024-08-26 430b1bce2f9bf0c5e9aa269fb0ee3aee22be49d6
后端迁移后bug修复
9 files modified
74 ■■■■■ changed files
gz-customerSystem/src/api/apiHandler.js 8 ●●●● patch | view | raw | blame | history
gz-customerSystem/src/api/appUrl.js 10 ●●●● patch | view | raw | blame | history
gz-customerSystem/src/components/Layout/index.jsx 7 ●●●●● patch | view | raw | blame | history
gz-customerSystem/src/components/MyTree/index.jsx 6 ●●●● patch | view | raw | blame | history
gz-customerSystem/src/components/basicInformation/personnel/PersonnelPage.jsx 8 ●●●● patch | view | raw | blame | history
gz-customerSystem/src/views/basicInformation/organization/index.jsx 5 ●●●●● patch | view | raw | blame | history
gz-customerSystem/src/views/basicInformation/organization/index.less 19 ●●●●● patch | view | raw | blame | history
gz-customerSystem/src/views/basicInformation/personnel/index.jsx 5 ●●●●● patch | view | raw | blame | history
gz-customerSystem/src/views/basicInformation/role/index.jsx 6 ●●●●● patch | view | raw | blame | history
gz-customerSystem/src/api/apiHandler.js
@@ -2,8 +2,8 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-16 11:28:12
 * @LastEditTime: 2023-04-25 19:06:37
 * @LastEditors: lwh
 * @LastEditTime: 2024-08-26 09:54:37
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: axios处理方法
 */
@@ -57,8 +57,8 @@
    
    const url =
        value.service === 'sys'
            ? `${appUrl.fileUrl}/${appUrl[value.service] || ''}/api/v1/${value.url}`
            : `${appUrl.baseUrl}/${appUrl[value.service] || ''}/api/v1/${value.url}`;
            ? `${appUrl.fileUrl}/${appUrl[value.service] || ''}/api/web/${value.url}`
            : `${appUrl.baseUrl}/${appUrl[value.service] || ''}/api/web/${value.url}`;
    if (value.type === 'get') {
        return ax
gz-customerSystem/src/api/appUrl.js
@@ -2,20 +2,20 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-16 11:25:57
 * @LastEditTime: 2024-08-23 09:35:11
 * @LastEditTime: 2024-08-26 10:55:13
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: api地址
 */
export const debug = {
    // web服务
    baseUrl: 'http://gz.hugeinfo.com.cn',
    // baseUrl: 'http://192.168.3.108:9002',
    // baseUrl: 'http://gz.hugeinfo.com.cn',
    baseUrl: 'http://192.168.3.108:9002',
    // baseUrl: 'http://mdqgnh.natappfree.cc',
    // 附件服务
    // fileUrl: 'http://192.168.3.108:9002',
    fileUrl: 'http://gz.hugeinfo.com.cn',
    fileUrl: 'http://192.168.3.108:9002',
    // fileUrl: 'http://gz.hugeinfo.com.cn',
    // 文件查看url 后面接附件编号
gz-customerSystem/src/components/Layout/index.jsx
@@ -2,7 +2,7 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-03-11 14:22:43
 * @LastEditTime: 2023-12-25 16:10:51
 * @LastEditTime: 2024-08-26 10:19:52
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 外层layout
@@ -117,16 +117,17 @@
        async function getRolePower(roleId, roleName) {
            global.setSpinning(true);
            const res = await getRolePowerApi(roleId);
            console.log(res,'res1111')
            global.setSpinning(false);
            if (res.type) {
                let resData = res.data?.roleTreeBOS || [];
                let menu_data = [];
                let power_data = [];
                resData.forEach((x) => {
                    if (x.appClient === '1' && x.powerTag !== 'pay') {
                    if (x.appClient === 1 && x.powerTag !== 'pay') {
                        menu_data.push(x);
                    }
                    if (x.appClient === '1' || x.powerTag === 'pay') {
                    if (x.appClient === 1 || x.powerTag === 'pay') {
                        power_data.push(x);
                    }
                });
gz-customerSystem/src/components/MyTree/index.jsx
@@ -2,8 +2,8 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-25 18:16:28
 * @LastEditTime: 2022-11-25 09:37:34
 * @LastEditors: ldh
 * @LastEditTime: 2024-08-26 10:27:36
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 自定义带操作的树结构
 */
@@ -53,7 +53,7 @@
            arr2 = [];
        treeDataMap.forEach((item) => {
            const strTitle = item[nameStr];
            const index = strTitle.indexOf(searchValue);
            const index = strTitle?.indexOf(searchValue);
            if (index > -1) {
                expandedKeys = Array.from(new Set([...expandedKeys, ...item.parentKeys]));
            }
gz-customerSystem/src/components/basicInformation/personnel/PersonnelPage.jsx
@@ -2,8 +2,8 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-25 14:40:57
 * @LastEditTime: 2022-11-03 11:35:05
 * @LastEditors: ldh
 * @LastEditTime: 2024-08-26 10:56:05
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 人员信息列表页面
 */
@@ -121,7 +121,7 @@
            title: '状态',
            dataIndex: 'status',
            width: 50,
            render: (text) => <span style={{ color: text === '1' ? '#52C41A' : '#BFBFBF' }}>{text === '1' ? '正常' : '停用'}</span>,
            render: (text) => <span style={{ color: text === 1 ? '#52C41A' : '#BFBFBF' }}>{text === 1 ? '正常' : '停用'}</span>,
        },
        {
            title: '操作',
@@ -138,7 +138,7 @@
                        {/* 22_00024-2超级管理员不可操作 */}
                        {!record.ctUseroleList?.filter((item) => item.roleCode === '22_00024-2').length && (
                            <>
                                {record.status === '1' ? (
                                {record.status === 1 ? (
                                    <Popconfirm title="是否确认停用该账号?" onConfirm={() => handleEditPerson('stop', record)}>
                                        <Link disabled={userId === record.id}>停用</Link>
                                    </Popconfirm>
gz-customerSystem/src/views/basicInformation/organization/index.jsx
@@ -2,7 +2,7 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-18 15:04:13
 * @LastEditTime: 2024-08-13 16:04:30
 * @LastEditTime: 2024-08-26 10:36:48
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 组织架构
@@ -159,6 +159,7 @@
            }
        }
    }
    console.log(organizationData,'organizationData')
    // 新增 or 修改组织
    async function setOrganization(submitType, values, form) {
@@ -334,7 +335,7 @@
                                <MyTree
                                    active={organizationActive.id}
                                    keyStr="id"
                                    nameStr="name"
                                    nameStr="unitName"
                                    data={organizationData}
                                    searchValue={organizationSearch.searchValue}
                                    dropdownOption={dropdownOptions}
gz-customerSystem/src/views/basicInformation/organization/index.less
@@ -56,25 +56,6 @@
    }
}
.arco-form-label-item .arco-form-item-tooltip {
    color: #1A6FB8;
}
//大厅来访
.must {
    font-size: 12px;
    color: rgb(245, 63, 63);
    background-color: rgb(255, 236, 232);
    line-height: 20px;
    padding: 0px 4px;
    border-radius: 2px;
    margin-left: 8px;
}
.arco-btn-primary:not(.arco-btn-disabled) {
    background-color: @main-color;
}
gz-customerSystem/src/views/basicInformation/personnel/index.jsx
@@ -2,8 +2,8 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-20 20:26:41
 * @LastEditTime: 2022-08-02 16:51:06
 * @LastEditors: ldh
 * @LastEditTime: 2024-08-26 10:42:51
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 人员信息
 */
@@ -146,6 +146,7 @@
        global.setSpinning(false);
        if (res.type) {
            let resData = res.data || {};
            console.log(resData,'resData')
            tableData.countZzStatus = resData.countZzStatus;
            tableData.total = resData.ctUserPage?.totalElements;
            tableData.data = resData.ctUserPage?.content;
gz-customerSystem/src/views/basicInformation/role/index.jsx
@@ -2,8 +2,8 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-18 15:12:34
 * @LastEditTime: 2022-08-02 15:53:17
 * @LastEditors: ldh
 * @LastEditTime: 2024-08-26 10:24:36
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 角色管理
 */
@@ -157,6 +157,7 @@
    async function getRolePower(roleId, isChange) {
        global.setSpinning(true);
        const res = await getRolePowerApi(roleId);
        console.log(res,'res22222')
        global.setSpinning(false);
        if (res.type) {
            if (isChange) {
@@ -211,6 +212,7 @@
        getAllData();
    }, []);
    // 角色操作
    const dropdownOption = ({ value }) =>
        value.id === 'none' ? null : (