diff --git a/config/routes.ts b/config/routes.ts index 8377a33..700eba8 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -2,11 +2,10 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-03-27 14:56:27 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-05-17 13:45:53 + * @LastEditTime: 2024-05-20 15:20:34 * @FilePath: \general-ai-manage\config\routes.ts * @Description: 页面路由池 */ - /** * @name umi 的路由配置 * @description 只支持 path,component,routes,redirect,wrappers,name,icon 的配置 @@ -47,7 +46,7 @@ const modelRouteIndex = { path: '/home/model-index', component: './Model/ModelIndex', access: 'canReadMenu', - menuIcon: 'icon-moxingliebiao-unselected', + // menuIcon: 'icon-moxingliebiao-unselected', key: 'model000', }; const subModelRoute = [ @@ -56,7 +55,9 @@ const subModelRoute = [ path: '/home/model-index', component: './Model/ModelIndex', access: 'canReadMenu', - menuIcon: 'icon-moxingliebiao-unselected', + // menuIcon: 'icon-moxingliebiao-unselected', + defaultIcon: 'modelListActiveIcon', + // activeIcon: modelListActiveIicon, key: 'model001', rootMenuKey: 'model000', }, diff --git a/public/home/home_bg.png b/public/home/home_bg.png index 5e6ebe0..36eaf92 100644 Binary files a/public/home/home_bg.png and b/public/home/home_bg.png differ diff --git a/public/home/nav_bg.png b/public/home/nav_bg.png new file mode 100644 index 0000000..ef69972 Binary files /dev/null and b/public/home/nav_bg.png differ diff --git a/public/icons/modelList_active.png b/public/icons/modelList_active.png new file mode 100644 index 0000000..ff727d9 Binary files /dev/null and b/public/icons/modelList_active.png differ diff --git a/public/icons/modelList_default.png b/public/icons/modelList_default.png new file mode 100644 index 0000000..eaec013 Binary files /dev/null and b/public/icons/modelList_default.png differ diff --git a/public/icons/modelRuntimeLib_active.png b/public/icons/modelRuntimeLib_active.png new file mode 100644 index 0000000..b396e02 Binary files /dev/null and b/public/icons/modelRuntimeLib_active.png differ diff --git a/public/icons/modelRuntimeLib_default.png b/public/icons/modelRuntimeLib_default.png new file mode 100644 index 0000000..155d0ca Binary files /dev/null and b/public/icons/modelRuntimeLib_default.png differ diff --git a/src/base.css b/src/base.css index ea3fcab..7605c66 100644 --- a/src/base.css +++ b/src/base.css @@ -113,7 +113,6 @@ color: #333333; font-family: PingFang SC, PingFang SC; font-style: normal; - text-align: left; text-transform: none; font-size: 14px; line-height: 20px; @@ -122,7 +121,6 @@ color: #333333; font-family: PingFang SC, PingFang SC; font-style: normal; - text-align: left; text-transform: none; font-size: 14px; font-family: PingFang SC-Medium; @@ -132,7 +130,6 @@ color: #333333; font-family: PingFang SC, PingFang SC; font-style: normal; - text-align: left; text-transform: none; font-size: 12px; line-height: 17px; @@ -150,6 +147,9 @@ } /* 重置ant组件 */ /* Button */ +.ant-btn { + border-radius: 2px; +} .ant-btn-primary, .ant-btn-primary:not(:disabled):not(.ant-btn-disabled):hover { background-color: #154ddd; @@ -163,10 +163,12 @@ background: #ffffff; border-color: #154ddd; } +.ant-pro-card-extra .ant-btn { + border-radius: 4px; +} .gn_search_from .ant-btn { padding: 4px 10px; border: none; - border-radius: 2px; } .gn_search_from .ant-btn-default { color: #333333; @@ -174,12 +176,12 @@ border: none; } .ant-tag { - background: white; height: 24px; line-height: 22px; - padding-inline: 8px; + background: white; border: 1px solid #dcdcdc; border-radius: 2px; + padding-inline: 8px; } .ant-form-item .ant-form-item-label > label { color: #333333; @@ -294,6 +296,7 @@ background: #ffffff; border: 1px solid rgba(21, 77, 221, 0.1); border-radius: 4px; + box-shadow: 0px 4px 8px 0px rgba(0, 79, 178, 0.15); } .gn_descriptions .ant-descriptions-item-label { color: #333333; @@ -389,13 +392,13 @@ background: transparent; } /* Card */ -.gn_card_123 > .ant-pro-card-header { +.gn_card_wrap > .ant-pro-card-header { height: 54px; margin: 0; - padding: 10px 16px; + padding: 16px; border-bottom: 1px solid #e0e0e0; } -.gn_card_123 > .ant-pro-card-body { +.gn_card_wrap > .ant-pro-card-body { margin: 0; padding: 16px 16px 0; } @@ -404,15 +407,15 @@ overflow: hidden; border-radius: 8px; } -.gn_table_card { +.gn_table_card_wrap { border-radius: 8px; } -.gn_table_card .gn_card > .ant-pro-card-header { +.gn_table_card_wrap .gn_card > .ant-pro-card-header { margin: 0; padding: 20px 16px; border-bottom: 1px solid #e0e0e0; } -.gn_table_card .gn_card > .ant-pro-card-body { +.gn_table_card_wrap .gn_card > .ant-pro-card-body { margin: 0; padding: 16px 16px 0; } @@ -471,7 +474,7 @@ margin: 0; } .gn_model_steps_form .ant-steps { - margin: 12px 0 20px; + margin: 16px 0; } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item { flex: auto; @@ -487,14 +490,17 @@ position: relative; display: flex; align-items: center; - justify-content: center; - margin: 8px 0; + justify-content: start; + height: 56px; + padding: 0 16px; } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-icon { - margin: 0 8px; + margin: 0; + font-size: 16px; } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-content { margin: 0; + margin-left: 8px; text-align: left; } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-title { @@ -508,9 +514,9 @@ .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-tail { position: absolute; top: auto; - left: calc(100% - 30px); - width: 16px; - height: 16px; + left: calc(100% - 12px - 16px); + width: 12px; + height: 12px; margin: 0; padding: 0; background: url('../public/home/business_arrow_default.svg') no-repeat; @@ -522,7 +528,7 @@ } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-finish { background: #e5edff; - border: 1px solid #154ddd; + border: 1px solid rgba(21, 77, 221, 0.1); } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-finish .ant-steps-item-icon { background-color: #154ddd; @@ -546,6 +552,7 @@ } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-active .ant-steps-item-title { color: #154ddd; + font-weight: bold; } .gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-active .ant-steps-item-description { color: #154ddd; @@ -554,6 +561,23 @@ background: url('../public/home/business_arrow.svg') no-repeat; background-size: cover; } +.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-active.ant-steps-item-process .ant-steps-item-icon { + background-color: #154ddd; + border-color: #154ddd; +} +/* 表单控件 */ +.gn_proFormUploadDragger_formItem.ant-upload-wrapper { + line-height: 1; +} +.gn_proFormUploadDragger_formItem .ant-upload-drag-container { + padding-top: 16px; +} +.gn_proFormUploadDragger_formItem p.ant-upload-drag-icon { + margin: 0 !important; +} +.gn_proFormUploadDragger_formItem .gn_uploadfile_title a { + color: #154ddd; +} .ant-table-wrapper .ant-table-pagination.ant-pagination { margin: 0; padding: 24px 0 !important; diff --git a/src/base.less b/src/base.less index c70c0a3..15513b0 100644 --- a/src/base.less +++ b/src/base.less @@ -133,7 +133,7 @@ color: #333333; font-family: PingFang SC, PingFang SC; font-style: normal; - text-align: left; + // text-align: left; text-transform: none; } .text1 { @@ -168,8 +168,9 @@ } /* 重置ant组件 */ /* Button */ -// .ant-btn { -// } +.ant-btn { + border-radius: 2px; +} .ant-btn-primary, .ant-btn-primary:not(:disabled):not(.ant-btn-disabled):hover { background-color: @primary_color; @@ -183,11 +184,16 @@ background: #ffffff; border-color: @primary_color; } +// 卡片右侧按钮 +.ant-pro-card-extra { + .ant-btn { + border-radius: 4px; + } +} .gn_search_from { .ant-btn { padding: 4px 10px; border: none; - border-radius: 2px; } .ant-btn-default { color: @text_color_1; @@ -356,6 +362,7 @@ background: #ffffff; border: 1px solid rgba(21, 77, 221, 0.1); border-radius: 4px; + box-shadow: 0px 4px 8px 0px rgba(0, 79, 178, 0.15); .ant-descriptions-item-label { color: @text_color_1; font-weight: bold; @@ -488,11 +495,11 @@ } /* Card */ -.gn_card_123 { +.gn_card_wrap { & > .ant-pro-card-header { height: 54px; margin: 0; - padding: 10px 16px; + padding: 16px; border-bottom: 1px solid #e0e0e0; } & > .ant-pro-card-body { @@ -505,7 +512,7 @@ overflow: hidden; border-radius: 8px; } -.gn_table_card { +.gn_table_card_wrap { // padding: 0 24px; border-radius: 8px; .gn_card { @@ -522,7 +529,6 @@ } } } - /* Form */ // 通用表单 .gn_form { @@ -588,7 +594,7 @@ margin: 0; } .ant-steps { - margin: 12px 0 20px; + margin: 16px 0; } // 步骤条 .ant-modal-content .ant-modal-body .ant-steps { @@ -606,15 +612,18 @@ position: relative; display: flex; align-items: center; - justify-content: center; - margin: 8px 0; + justify-content: start; + height: 56px; + padding: 0 16px; } .ant-steps-item-icon { - margin: 0 8px; + margin: 0; + font-size: 16px; } .ant-steps-item-content { margin: 0; + margin-left: 8px; text-align: left; } .ant-steps-item-title { @@ -630,9 +639,9 @@ // display: none; position: absolute; top: auto; - left: calc(100% - 30px); - width: 16px; - height: 16px; + left: calc(100% - 12px - 16px); + width: 12px; + height: 12px; margin: 0; padding: 0; // background-color: red; @@ -649,18 +658,18 @@ // 已完成 .ant-steps-item-finish { background: #e5edff; - border: 1px solid #154ddd; + border: 1px solid rgba(21, 77, 221, 0.1); .ant-steps-item-icon { - background-color: #154ddd; + background-color: @primary_color; .ant-steps-icon { color: white; } } .ant-steps-item-title { - color: #154ddd; + color: @primary_color; } .ant-steps-item-description { - color: #154ddd; + color: @primary_color; } .ant-steps-item-tail { background: url('../public/home/business_arrow.svg') no-repeat; @@ -670,17 +679,41 @@ // 当前选中 .ant-steps-item-active { background: #e5edff; - border: 1px solid #154ddd; + border: 1px solid @primary_color; .ant-steps-item-title { - color: #154ddd; + color: @primary_color; + font-weight: bold; } .ant-steps-item-description { - color: #154ddd; + color: @primary_color; } .ant-steps-item-tail { background: url('../public/home/business_arrow.svg') no-repeat; background-size: cover; } + &.ant-steps-item-process .ant-steps-item-icon { + background-color: @primary_color; + border-color: @primary_color; + } + } + } +} + +/* 表单控件 */ + +.gn_proFormUploadDragger_formItem { + &.ant-upload-wrapper { + line-height: 1; + } + .ant-upload-drag-container { + padding-top: 16px; + } + p.ant-upload-drag-icon { + margin: 0 !important; + } + .gn_uploadfile_title { + a { + color: @primary_color; } } } diff --git a/src/hooks/useHomeRoute.tsx b/src/hooks/useHomeRoute.tsx new file mode 100644 index 0000000..a2e1e8e --- /dev/null +++ b/src/hooks/useHomeRoute.tsx @@ -0,0 +1,37 @@ +/* + * @Author: donghao donghao@supervision.ltd + * @Date: 2024-05-20 15:12:33 + * @LastEditors: donghao donghao@supervision.ltd + * @LastEditTime: 2024-05-20 15:33:18 + * @FilePath: \general-ai-platform-web\src\hooks\useHomeRoute.tsx + * @Description: 外层页面中间方法集合 + */ +import modelListActive from '../../public/icons/modelList_active.png'; +import modelLisDefault from '../../public/icons/modelList_default.png'; +import modelRuntimeLibActive from '../../public/icons/modelRuntimeLib_active.png'; +import modelRuntimeLibDefault from '../../public/icons/modelRuntimeLib_default.png'; + +export const useHomeRoute = () => { + const fetchMenuIconByRoute = (menuItem, currRoute) => { + let currIcon = ''; + switch (menuItem?.name) { + case 'model-index': + currIcon = currRoute?.path === menuItem.path ? modelListActive : modelLisDefault; + break; + case 'model-runtime-lib': + currIcon = + currRoute?.path === menuItem.path ? modelRuntimeLibActive : modelRuntimeLibDefault; + break; + } + + return currIcon ? ( + + ) : ( + + ); + }; + + return { + fetchMenuIconByRoute, + }; +}; diff --git a/src/iconfont.css b/src/iconfont.css index 1943a84..5c9695d 100644 --- a/src/iconfont.css +++ b/src/iconfont.css @@ -1,102 +1,101 @@ @font-face { - font-family: "iconfont"; + font-family: 'iconfont'; /* Project id 4530966 */ src: url('//at.alicdn.com/t/c/font_4530966_zyyfefdavpo.woff2?t=1715586941725') format('woff2'), url('//at.alicdn.com/t/c/font_4530966_zyyfefdavpo.woff?t=1715586941725') format('woff'), url('//at.alicdn.com/t/c/font_4530966_zyyfefdavpo.ttf?t=1715586941725') format('truetype'); } .iconfont { - font-family: "iconfont" !important; - font-size: 16px; + font-family: 'iconfont' !important; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } .icon-fuzhi:before { - content: "\e719"; + content: '\e719'; } .icon-zip:before { - content: "\e71a"; + content: '\e71a'; } .icon-shangchuanwenjian:before { - content: "\e718"; + content: '\e718'; } .icon-you:before { - content: "\e717"; + content: '\e717'; } .icon-delete:before { - content: "\e716"; + content: '\e716'; } .icon-tianjiafenlei:before { - content: "\e714"; + content: '\e714'; } .icon-shanchufenlei:before { - content: "\e715"; + content: '\e715'; } .icon-tianjiajiedian:before { - content: "\e713"; + content: '\e713'; } .icon-banbenxinxi:before { - content: "\e711"; + content: '\e711'; } .icon-shiyonghangye:before { - content: "\e712"; + content: '\e712'; } .icon-jiedianshezhi:before { - content: "\e70f"; + content: '\e70f'; } .icon-fuwuqizhuangtai:before { - content: "\e710"; + content: '\e710'; } .icon-yewumoxing:before { - content: "\e70b"; + content: '\e70b'; } .icon-shouye:before { - content: "\e70c"; + content: '\e70c'; } .icon-shebeizhuangtai:before { - content: "\e70d"; + content: '\e70d'; } .icon-qiyexinxi:before { - content: "\e70e"; + content: '\e70e'; } .icon-moxingliebiao-unselected:before { - content: "\e709"; + content: '\e709'; } .icon-moxingyunhangku-selected:before { - content: "\e70a"; + content: '\e70a'; } .icon-wen:before { - content: "\e704"; + content: '\e704'; } .icon-xia:before { - content: "\e705"; + content: '\e705'; } .icon-moxingliebiao-selected:before { - content: "\e706"; + content: '\e706'; } .icon-moxingyunhangku-unselected:before { - content: "\e707"; + content: '\e707'; } .icon-close:before { - content: "\e708"; + content: '\e708'; } .icon-moxingshuliang:before { - content: "\e6fd"; + content: '\e6fd'; } .icon-shebeishuliang:before { - content: "\e6fe"; + content: '\e6fe'; } .icon-xinjian:before { - content: "\e6ff"; + content: '\e6ff'; } .icon-gengduo:before { - content: "\e700"; + content: '\e700'; } .icon-chuangjianshijian:before { - content: "\e701"; + content: '\e701'; } .icon-search:before { - content: "\e702"; + content: '\e702'; } .icon-refresh:before { - content: "\e703"; + content: '\e703'; } diff --git a/src/iconfont.less b/src/iconfont.less index 319fd17..3a47644 100644 --- a/src/iconfont.less +++ b/src/iconfont.less @@ -6,7 +6,7 @@ } .iconfont { - font-size: 16px; + // font-size: 16px; font-family: 'iconfont' !important; font-style: normal; -webkit-font-smoothing: antialiased; diff --git a/src/layouts/HomeLayout.tsx b/src/layouts/HomeLayout.tsx index dd256ba..3a73352 100644 --- a/src/layouts/HomeLayout.tsx +++ b/src/layouts/HomeLayout.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-04-07 15:25:23 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-05-17 13:56:57 + * @LastEditTime: 2024-05-20 15:26:48 * @FilePath: \general-ai-manage\src\layouts\HomeLayout.tsx * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -13,6 +13,7 @@ import { SettingDrawer } from '@ant-design/pro-components'; import { Outlet, history, useIntl, useLocation } from '@umijs/max'; import { ConfigProvider, Layout, theme } from 'antd'; +import { useHomeRoute } from '@/hooks/useHomeRoute'; import React, { useEffect, useState } from 'react'; // public/home/logo.svg // import defaultSettings from '../../config/defaultSettings'; @@ -26,6 +27,7 @@ const isDev = false; const { Header, Content } = Layout; const HomeLayout: React.FC = () => { + const { fetchMenuIconByRoute } = useHomeRoute(); const { initialState, setInitialState } = useModel('@@initialState'); // const { token } = theme.useToken(); const intl = useIntl(); @@ -185,7 +187,8 @@ const HomeLayout: React.FC = () => { }`} >
- + {fetchMenuIconByRoute(menuItem, currRoute)} + {/* */} {intl.formatMessage({ id: `menu.${menuItem.name}`, defaultMessage: '$$$' })} diff --git a/src/layouts/homeLayout.less b/src/layouts/homeLayout.less index 0a2a97b..54dd290 100644 --- a/src/layouts/homeLayout.less +++ b/src/layouts/homeLayout.less @@ -18,7 +18,11 @@ padding: 0 32px; color: rgba(0, 0, 0, 0.88); line-height: 64px; - background: @primary_color; + background-color: @primary_color; + background-image: url('../../public/home/nav_bg.png'); + background-repeat: no-repeat; + background-position: center; + background-size: contain; border-radius: 8px; // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.05); .home_logo { @@ -47,7 +51,7 @@ li { height: 32px; margin: 14px 0; - padding: 0 12px; + padding: 0 16px; color: #fff; font-size: 16px; line-height: 32px; diff --git a/src/pages/Business/BusinessModel/index.tsx b/src/pages/Business/BusinessModel/index.tsx index 291f2ae..83146c3 100644 --- a/src/pages/Business/BusinessModel/index.tsx +++ b/src/pages/Business/BusinessModel/index.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-04-22 15:23:36 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-05-07 13:26:50 + * @LastEditTime: 2024-05-20 11:00:25 * @FilePath: \general-ai-platform-web\src\pages\Node\BusinessModel\index.tsx * @Description: 业务模型 * @交互说明 @@ -127,7 +127,7 @@ const BusinessModel: React.FC = () => { return (
diff --git a/src/pages/Business/BusinessState/components/detailDeviceState.tsx b/src/pages/Business/BusinessState/components/detailDeviceState.tsx index c75c259..c7cff47 100644 --- a/src/pages/Business/BusinessState/components/detailDeviceState.tsx +++ b/src/pages/Business/BusinessState/components/detailDeviceState.tsx @@ -251,7 +251,7 @@ const DetailDeviceState: React.FC = ({ info, detailOpen, } }} > - + = ({ info, detailOpen, > {tabKey === '0' && (
- +

  • diff --git a/src/pages/Business/BusinessState/components/detailDeviceStateLog.tsx b/src/pages/Business/BusinessState/components/detailDeviceStateLog.tsx index 3687d9e..ee7bda1 100644 --- a/src/pages/Business/BusinessState/components/detailDeviceStateLog.tsx +++ b/src/pages/Business/BusinessState/components/detailDeviceStateLog.tsx @@ -52,7 +52,7 @@ const DetailDeviceStateLog: React.FC = () => { ]; return (

    - + = ({ info, detailOpen, } }} > - + = ({ info, detailOpen, > {tabKey === '0' && (
    - +

    • diff --git a/src/pages/Business/BusinessState/components/detailServerStateLog.tsx b/src/pages/Business/BusinessState/components/detailServerStateLog.tsx index f494db0..518984a 100644 --- a/src/pages/Business/BusinessState/components/detailServerStateLog.tsx +++ b/src/pages/Business/BusinessState/components/detailServerStateLog.tsx @@ -51,7 +51,7 @@ const DetailServerStateLog: React.FC = () => { ]; return (

      - + {
      - +
      { return (
      - +
      = ({ info, detailOpen, okText={} cancelText={} > - +
      diff --git a/src/pages/Business/DeviceGroup/index.css b/src/pages/Business/DeviceGroup/index.css index f1415fb..bd9db8e 100644 --- a/src/pages/Business/DeviceGroup/index.css +++ b/src/pages/Business/DeviceGroup/index.css @@ -3,10 +3,10 @@ /* 节点列表 */ /* 节点信息 */ } -.deviceGroup_page .dg_content .gn_card_123 { +.deviceGroup_page .dg_content .gn_card_wrap { height: calc(100% - 8px); } -.deviceGroup_page .node_list > .gn_card_123 { +.deviceGroup_page .node_list > .gn_card_wrap { box-shadow: 0px 2px 8px 0px rgba(0, 79, 178, 0.15); } .deviceGroup_page .node_info { diff --git a/src/pages/Business/DeviceGroup/index.less b/src/pages/Business/DeviceGroup/index.less index d269042..cc2691c 100644 --- a/src/pages/Business/DeviceGroup/index.less +++ b/src/pages/Business/DeviceGroup/index.less @@ -1,13 +1,13 @@ .deviceGroup_page { height: calc(100vh - 92px); .dg_content { - .gn_card_123 { + .gn_card_wrap { height: calc(100% - 8px); } } /* 节点列表 */ .node_list { - & > .gn_card_123 { + & > .gn_card_wrap { box-shadow: 0px 2px 8px 0px rgba(0, 79, 178, 0.15); } } diff --git a/src/pages/Business/DeviceGroup/index.tsx b/src/pages/Business/DeviceGroup/index.tsx index c06bae2..e736a51 100644 --- a/src/pages/Business/DeviceGroup/index.tsx +++ b/src/pages/Business/DeviceGroup/index.tsx @@ -68,7 +68,7 @@ const DeviceGroup: React.FC = () => {
      {/* 节点列表 */}
      - 节点列表}> + 节点列表}>
      { {/* 节点信息 */}
      节点信息} extra={
      } actionRef={actionFormListRef} @@ -386,8 +410,8 @@ const CreateForm: React.FC = (props) => { {() => { return ( <> - - + + ); }} diff --git a/src/pages/Model/ModelDetail/index.tsx b/src/pages/Model/ModelDetail/index.tsx index 3551c77..8cca479 100644 --- a/src/pages/Model/ModelDetail/index.tsx +++ b/src/pages/Model/ModelDetail/index.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-04-08 10:36:06 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-05-16 14:02:17 + * @LastEditTime: 2024-05-20 11:10:22 * @FilePath: \general-ai-manage\src\pages\Model\ModelDetail\index.tsx * @Description: 模型详情（基础信息展示、模型版本列表） * @交互说明 @@ -86,6 +86,8 @@ const ModelDetail: React.FC = () => { hideInSearch: true, key: 'fixedName', fixed: 'left', + width: '16%', + render: (dom, record) => (
      {dom} @@ -93,8 +95,12 @@ const ModelDetail: React.FC = () => { {record.isEnable && ( { ), dataIndex: 'path', hideInSearch: true, - width: '40%', + width: '45%', }, { title: , dataIndex: 'size', hideInSearch: true, + width: '10%', }, { @@ -213,7 +220,7 @@ const ModelDetail: React.FC = () => { style={{ padding: 0, margin: 0, backgroundColor: 'transparent' }} bodyStyle={{ padding: 0, margin: 0, backgroundColor: 'transparent' }} > - +
      {
      { } >
      { }, [actionRef, querysData]); return ( -
      +
      { + buttonLabel={} + > {openFiles ? ( { }, ]; return ( -
      +
      {
      基础信息} extra={
      - 账号信息}> + 账号信息}>
      企业算法({total})} >