diff --git a/config/defaultApi.ts b/config/defaultApi.ts index d5f6237..a6fb16d 100644 --- a/config/defaultApi.ts +++ b/config/defaultApi.ts @@ -2,8 +2,9 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-05-31 14:46:59 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-05-31 14:47:08 + * @LastEditTime: 2024-06-28 10:00:02 * @FilePath: \general-ai-platform-web\config\defaultApi.ts * @Description: 通用api配置 */ export const fileApiActionUrl = '/api/v1/file/upload'; +export const dataViewUrl = 'http://192.168.10.26:8848/indexDataScreen.html#/workbench'; diff --git a/public/icons/treeLine.svg b/public/icons/treeLine.svg deleted file mode 100644 index 1557447..0000000 --- a/public/icons/treeLine.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/public/images/computePowerCenter/bg_banner.png b/public/images/computePowerCenter/bg_banner.png new file mode 100644 index 0000000..bf13ca3 Binary files /dev/null and b/public/images/computePowerCenter/bg_banner.png differ diff --git a/public/images/computePowerCenter/bg_logo_1.png b/public/images/computePowerCenter/bg_logo_1.png new file mode 100644 index 0000000..681e0ea Binary files /dev/null and b/public/images/computePowerCenter/bg_logo_1.png differ diff --git a/public/images/computePowerCenter/bg_logo_2.png b/public/images/computePowerCenter/bg_logo_2.png new file mode 100644 index 0000000..589f9d7 Binary files /dev/null and b/public/images/computePowerCenter/bg_logo_2.png differ diff --git a/src/base.css b/src/base.css index 140bb1c..9549a92 100644 --- a/src/base.css +++ b/src/base.css @@ -458,12 +458,21 @@ .gn_form .ant-form-item { margin-bottom: 16px; } +.gn_form .ant-select-outlined:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer):hover .ant-select-selector, +.gn_form .ant-picker-outlined:focus-within { + border-color: #154ddd; +} +.gn_form :where(.css-dev-only-do-not-override-1okl62o).ant-picker-range .ant-picker-active-bar { + background: #154ddd; +} .gn_form .ant-pro-form-group-container { gap: 0px 12px !important; } .gn_form .ant-input-affix-wrapper, .gn_form .ant-select-single .ant-select-selector, -.gn_form .ant-input { +.gn_form .ant-input, +.gn_form .ant-select-multiple .ant-select-selector, +.gn_form .ant-picker { border-radius: 2px; } .gn_form .ant-radio-button-wrapper { diff --git a/src/base.less b/src/base.less index 83eb1c4..f3bf74f 100644 --- a/src/base.less +++ b/src/base.less @@ -563,13 +563,25 @@ .ant-form-item { margin-bottom: 16px; } + .ant-select-outlined:not(.ant-select-disabled):not(.ant-select-customize-input):not( + .ant-pagination-size-changer + ):hover + .ant-select-selector, + .ant-picker-outlined:focus-within { + border-color: @primary_color; + } + :where(.css-dev-only-do-not-override-1okl62o).ant-picker-range .ant-picker-active-bar { + background: @primary_color; + } // 表单项之间间距 .ant-pro-form-group-container { gap: 0px 12px !important; } .ant-input-affix-wrapper, .ant-select-single .ant-select-selector, - .ant-input { + .ant-input, + .ant-select-multiple .ant-select-selector, + .ant-picker { border-radius: 2px; } .ant-radio-button-wrapper { diff --git a/src/iconfont.css b/src/iconfont.css index cfeeb9f..34f93e0 100644 --- a/src/iconfont.css +++ b/src/iconfont.css @@ -1,7 +1,7 @@ @font-face { font-family: "iconfont"; /* Project id 4530966 */ - src: url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.woff2?t=1716257643893') format('woff2'), url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.woff?t=1716257643893') format('woff'), url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.ttf?t=1716257643893') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.woff2?t=1719539403683') format('woff2'), url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.woff?t=1719539403683') format('woff'), url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.ttf?t=1719539403683') format('truetype'); } .iconfont { font-family: "iconfont" !important; @@ -9,6 +9,9 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-a-shujukeshihua21x:before { + content: "\e608"; +} .icon-fanhui:before { content: "\e71f"; } diff --git a/src/iconfont.less b/src/iconfont.less index 689c560..8c9766d 100644 --- a/src/iconfont.less +++ b/src/iconfont.less @@ -1,8 +1,8 @@ @font-face { font-family: 'iconfont'; /* Project id 4530966 */ - src: url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.woff2?t=1716257643893') format('woff2'), - url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.woff?t=1716257643893') format('woff'), - url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.ttf?t=1716257643893') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.woff2?t=1719539403683') format('woff2'), + url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.woff?t=1719539403683') format('woff'), + url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.ttf?t=1719539403683') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-a-shujukeshihua21x:before { + content: '\e608'; +} + .icon-fanhui:before { content: '\e71f'; } diff --git a/src/layouts/HomeLayout.tsx b/src/layouts/HomeLayout.tsx index 2c6e835..b411b5d 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-06-17 14:23:43 + * @LastEditTime: 2024-06-28 09:57:42 * @FilePath: \general-ai-manage\src\layouts\HomeLayout.tsx * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -19,8 +19,8 @@ import React, { useEffect, useState } from 'react'; // import defaultSettings from '../../config/defaultSettings'; import less from 'less'; +import { dataViewUrl } from '../../config/defaultApi'; import { outerMenuRoute } from '../../config/routes'; - import './homeLayout.less'; const isDev = false; @@ -123,6 +123,10 @@ const HomeLayout: React.FC = () => { } }; + function openViewHtml() { + window.open(dataViewUrl); + } + useEffect(() => { // 调用修改主题颜色的函数 changeThemeColor(); @@ -158,7 +162,11 @@ const HomeLayout: React.FC = () => { })} -
+
+
+ + 数据可视化 +
diff --git a/src/pages/ComputePowerCenter/components/computePowerCube.tsx b/src/pages/ComputePowerCenter/components/computePowerCube.tsx index 1f7b3ce..eb494d5 100644 --- a/src/pages/ComputePowerCenter/components/computePowerCube.tsx +++ b/src/pages/ComputePowerCenter/components/computePowerCube.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-03-11 16:48:04 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-06-11 17:56:15 + * @LastEditTime: 2024-06-28 13:56:53 * @FilePath: \general-ai-platform-web\src\pages\ComputePowerAllocation\components\computePowerCube.tsx * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -22,7 +22,7 @@ const ComputePowerCube: React.FC = (props) => { useEffect(() => { console.log(cubeBoxRefs.current.clientWidth, 'cubeBoxRefs'); let finalList = []; - const totalWidth = cubeBoxRefs.current?.clientWidth + 6 || 1062; + const totalWidth = cubeBoxRefs.current?.clientWidth + 5 || 1062; finalList = props.list.map((item) => { item.value = Math.floor((item.proportion / 100) * totalWidth); return item; diff --git a/src/pages/ComputePowerCenter/index.css b/src/pages/ComputePowerCenter/index.css index 9a560d7..52d344f 100644 --- a/src/pages/ComputePowerCenter/index.css +++ b/src/pages/ComputePowerCenter/index.css @@ -5,8 +5,8 @@ .computePowerAllocation_body .head_box { margin-top: 16px; padding: 12px 16px; - background: #ebf3ff; - border: 1px solid rgba(21, 77, 221, 0.1); + background: url('/images/computePowerCenter/bg_banner.png') no-repeat 0 0; + background-size: cover; border-radius: 4px 4px 4px 4px; } .computePowerAllocation_body .head_info .bg_header_logo { diff --git a/src/pages/ComputePowerCenter/index.less b/src/pages/ComputePowerCenter/index.less index d6bacef..352e511 100644 --- a/src/pages/ComputePowerCenter/index.less +++ b/src/pages/ComputePowerCenter/index.less @@ -2,8 +2,10 @@ .head_box { margin-top: 16px; padding: 12px 16px; - background: #ebf3ff; - border: 1px solid rgba(21, 77, 221, 0.1); + // background: #ebf3ff; + // border: 1px solid rgba(21, 77, 221, 0.1); + background: url('/images/computePowerCenter/bg_banner.png') no-repeat 0 0; + background-size: cover; border-radius: 4px 4px 4px 4px; } diff --git a/src/pages/Log/index.tsx b/src/pages/Log/index.tsx index 39d3227..65dd158 100644 --- a/src/pages/Log/index.tsx +++ b/src/pages/Log/index.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-04-07 14:02:00 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-06-20 17:14:13 + * @LastEditTime: 2024-06-28 14:04:41 * @FilePath: \general-ai-manage\src\pages\Log\index.tsx * @Description: 系统日志 * @交互说明 @@ -99,7 +99,7 @@ const LogIndex: React.FC = () => { title={