Merge pull request 'fix:设置' (#22) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m42s

Reviewed-on: #22
This commit is contained in:
zsq 2026-01-26 20:29:13 +08:00
commit 2a7743206c
2 changed files with 22 additions and 13 deletions

View File

@ -14,8 +14,8 @@ export default defineConfig({
},
proxy: {
'/api/': {
target: 'http://10.39.13.78:8001/',
// target: 'https://test-admin.linyikj.com.cn/',
// target: 'http://10.39.13.78:8001/',
target: 'https://test-admin.linyikj.com.cn/',
// target: 'https://admin.linyikj.com.cn/',
changeOrigin: true,
pathRewrite: { '^': '' },

View File

@ -5,7 +5,6 @@ import { useParams } from '@umijs/max';
import { Space, Steps, Tabs } from 'antd';
import { useEffect, useState } from 'react';
import { FileProtectOutlined } from '@ant-design/icons';
import ComponentsInfo from '../modals/CompanyShow';
import CompanyUpdate from '../modals/CompanyUpdate';
import CompanyApps from '../table/Apps';
@ -47,7 +46,7 @@ export default function Show({ title }: { title?: string } = {}) {
let items = [
{
label: '项目配置',
label: '应用配置',
key: '1',
closable: false,
children: <CompanyApps item={data} />,
@ -78,13 +77,13 @@ export default function Show({ title }: { title?: string } = {}) {
},
{
label: '应用配置',
label: '品牌配置',
key: '6',
closable: false,
children: <Brands item={data} />,
},
{
label: '品牌配置',
label: '项目配置',
key: '7',
closable: false,
children: <Assets item={data} />,
@ -127,37 +126,47 @@ export default function Show({ title }: { title?: string } = {}) {
{
title: '应用配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '组织配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '岗位配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '员工配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '账号配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '品牌配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '项目配置',
status: 'finish',
icon: <FileProtectOutlined />,
icon: <></>,
},
{
title: '权限配置',
status: 'finish',
icon: <></>,
},
{
title: '客户端配置',
status: 'finish',
icon: <></>,
},
]}
/>