feat: 联调基本完成

develop2
donghao 10 months ago
parent 3a2db5a76c
commit d6d8b21265

@ -2,8 +2,9 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-05-31 14:46:59 * @Date: 2024-05-31 14:46:59
* @LastEditors: donghao donghao@supervision.ltd * @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 * @FilePath: \general-ai-platform-web\config\defaultApi.ts
* @Description: api * @Description: api
*/ */
export const fileApiActionUrl = '/api/v1/file/upload'; export const fileApiActionUrl = '/api/v1/file/upload';
export const dataViewUrl = 'http://192.168.10.26:8848/indexDataScreen.html#/workbench';

@ -1,3 +0,0 @@
<svg>
<path d="M0,0 Q150,150 300,300" stroke="black" fill="transparent" />
</svg>

Before

Width:  |  Height:  |  Size: 85 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

@ -458,12 +458,21 @@
.gn_form .ant-form-item { .gn_form .ant-form-item {
margin-bottom: 16px; 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 { .gn_form .ant-pro-form-group-container {
gap: 0px 12px !important; gap: 0px 12px !important;
} }
.gn_form .ant-input-affix-wrapper, .gn_form .ant-input-affix-wrapper,
.gn_form .ant-select-single .ant-select-selector, .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; border-radius: 2px;
} }
.gn_form .ant-radio-button-wrapper { .gn_form .ant-radio-button-wrapper {

@ -563,13 +563,25 @@
.ant-form-item { .ant-form-item {
margin-bottom: 16px; 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 { .ant-pro-form-group-container {
gap: 0px 12px !important; gap: 0px 12px !important;
} }
.ant-input-affix-wrapper, .ant-input-affix-wrapper,
.ant-select-single .ant-select-selector, .ant-select-single .ant-select-selector,
.ant-input { .ant-input,
.ant-select-multiple .ant-select-selector,
.ant-picker {
border-radius: 2px; border-radius: 2px;
} }
.ant-radio-button-wrapper { .ant-radio-button-wrapper {

@ -1,7 +1,7 @@
@font-face { @font-face {
font-family: "iconfont"; font-family: "iconfont";
/* Project id 4530966 */ /* 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 { .iconfont {
font-family: "iconfont" !important; font-family: "iconfont" !important;
@ -9,6 +9,9 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-a-shujukeshihua21x:before {
content: "\e608";
}
.icon-fanhui:before { .icon-fanhui:before {
content: "\e71f"; content: "\e71f";
} }

@ -1,8 +1,8 @@
@font-face { @font-face {
font-family: 'iconfont'; /* Project id 4530966 */ font-family: 'iconfont'; /* Project id 4530966 */
src: url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.woff2?t=1716257643893') format('woff2'), src: url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.woff2?t=1719539403683') format('woff2'),
url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.woff?t=1716257643893') format('woff'), url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.woff?t=1719539403683') format('woff'),
url('//at.alicdn.com/t/c/font_4530966_63ch463u1o5.ttf?t=1716257643893') format('truetype'); url('//at.alicdn.com/t/c/font_4530966_gx8lbf9jsm6.ttf?t=1719539403683') format('truetype');
} }
.iconfont { .iconfont {
@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-a-shujukeshihua21x:before {
content: '\e608';
}
.icon-fanhui:before { .icon-fanhui:before {
content: '\e71f'; content: '\e71f';
} }

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-07 15:25:23 * @Date: 2024-04-07 15:25:23
* @LastEditors: donghao donghao@supervision.ltd * @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 * @FilePath: \general-ai-manage\src\layouts\HomeLayout.tsx
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 defaultSettings from '../../config/defaultSettings';
import less from 'less'; import less from 'less';
import { dataViewUrl } from '../../config/defaultApi';
import { outerMenuRoute } from '../../config/routes'; import { outerMenuRoute } from '../../config/routes';
import './homeLayout.less'; import './homeLayout.less';
const isDev = false; const isDev = false;
@ -123,6 +123,10 @@ const HomeLayout: React.FC = () => {
} }
}; };
function openViewHtml() {
window.open(dataViewUrl);
}
useEffect(() => { useEffect(() => {
// 调用修改主题颜色的函数 // 调用修改主题颜色的函数
changeThemeColor(); changeThemeColor();
@ -158,7 +162,11 @@ const HomeLayout: React.FC = () => {
})} })}
</ul> </ul>
</div> </div>
<div className="home_nav_action"> <div className="flex items-center home_nav_action">
<div className="mr-[16px] text-[16px] cursor-pointer" onClick={openViewHtml}>
<i className="text-white iconfont icon-a-shujukeshihua21x pr-[8px] text-[16px]"></i>
<span></span>
</div>
<AvatarDropdown menu={true}> <AvatarDropdown menu={true}>
<div className="flex items-center cursor-pointer avatar_box"> <div className="flex items-center cursor-pointer avatar_box">
<AvatarName></AvatarName> <AvatarName></AvatarName>

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-03-11 16:48:04 * @Date: 2024-03-11 16:48:04
* @LastEditors: donghao donghao@supervision.ltd * @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 * @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 * @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@ -22,7 +22,7 @@ const ComputePowerCube: React.FC<ComputePowerCubeProps> = (props) => {
useEffect(() => { useEffect(() => {
console.log(cubeBoxRefs.current.clientWidth, 'cubeBoxRefs'); console.log(cubeBoxRefs.current.clientWidth, 'cubeBoxRefs');
let finalList = []; let finalList = [];
const totalWidth = cubeBoxRefs.current?.clientWidth + 6 || 1062; const totalWidth = cubeBoxRefs.current?.clientWidth + 5 || 1062;
finalList = props.list.map((item) => { finalList = props.list.map((item) => {
item.value = Math.floor((item.proportion / 100) * totalWidth); item.value = Math.floor((item.proportion / 100) * totalWidth);
return item; return item;

@ -5,8 +5,8 @@
.computePowerAllocation_body .head_box { .computePowerAllocation_body .head_box {
margin-top: 16px; margin-top: 16px;
padding: 12px 16px; padding: 12px 16px;
background: #ebf3ff; background: url('/images/computePowerCenter/bg_banner.png') no-repeat 0 0;
border: 1px solid rgba(21, 77, 221, 0.1); background-size: cover;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
} }
.computePowerAllocation_body .head_info .bg_header_logo { .computePowerAllocation_body .head_info .bg_header_logo {

@ -2,8 +2,10 @@
.head_box { .head_box {
margin-top: 16px; margin-top: 16px;
padding: 12px 16px; padding: 12px 16px;
background: #ebf3ff; // background: #ebf3ff;
border: 1px solid rgba(21, 77, 221, 0.1); // 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; border-radius: 4px 4px 4px 4px;
} }

@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd * @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-07 14:02:00 * @Date: 2024-04-07 14:02:00
* @LastEditors: donghao donghao@supervision.ltd * @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 * @FilePath: \general-ai-manage\src\pages\Log\index.tsx
* @Description: * @Description:
* @ * @
@ -99,7 +99,7 @@ const LogIndex: React.FC = () => {
title={ title={
<div className="gn_form gn_table_query_filter"> <div className="gn_form gn_table_query_filter">
<ProForm <ProForm
className="gn_search_from" className="gn_search_from gn_form"
form={form} form={form}
layout="horizontal" layout="horizontal"
submitter={{ submitter={{

Loading…
Cancel
Save