-
-
-
- {/* {initialState?.currentUser?.userName ? (
+
+
+ {currMenu?.name &&
+ intl.formatMessage({ id: `menu.${currMenu?.name}`, defaultMessage: '首页' })}
+
+
+
+
+
+ {/* {initialState?.currentUser?.userName ? (
@@ -215,6 +216,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
) : (
<>
)} */}
+
diff --git a/src/components/MenuBar/index.less b/src/components/MenuBar/index.less
index 0f017f2..20a5acc 100644
--- a/src/components/MenuBar/index.less
+++ b/src/components/MenuBar/index.less
@@ -52,7 +52,7 @@
}
.menu_top {
width: 100%;
- height: 72px;
+ height: 64px;
color: @primary_color;
font-weight: bold;
border-radius: 0px 0px 64px 0px;
diff --git a/src/components/UploadFile/src/draggerUpload.tsx b/src/components/UploadFile/src/draggerUpload.tsx
index 297ad50..dafee65 100644
--- a/src/components/UploadFile/src/draggerUpload.tsx
+++ b/src/components/UploadFile/src/draggerUpload.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-07-16 13:02:35
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-07-16 17:10:10
+ * @LastEditTime: 2024-07-18 09:33:17
* @FilePath: \general-ai-platform-web\src\components\UploadFile\src\draggerUpload.tsx
* @Description: 拖拽上传
*
@@ -53,7 +53,7 @@ const DraggerUpload: React.FC = (props) => {
const defualtOptions = {
accept: props?.proFieldProps?.accept || 'application/json, application/x-yaml', // 默认使用 JSON 或者 yaml 文件类型
max: props?.proFieldProps?.max || 1,
- size: props?.proFieldProps?.size || 1024 * 1024 * 200,
+ size: props?.proFieldProps?.size || 1024 * 1024 * 200, // 默认200M
};
// const defalutOptions: UploadProps = {
// name: 'file',
@@ -203,7 +203,6 @@ const DraggerUpload: React.FC = (props) => {
)}
-
{props?.openPreviewFile &&
}
);
diff --git a/src/pages/Business/BusinessModel/components/createForm.tsx b/src/pages/Business/BusinessModel/components/createForm.tsx
index 9e51f47..29c7471 100644
--- a/src/pages/Business/BusinessModel/components/createForm.tsx
+++ b/src/pages/Business/BusinessModel/components/createForm.tsx
@@ -1,4 +1,4 @@
-import { FormUploadDraggerToken } from '@/components/UploadFile';
+import { DraggerUpload } from '@/components/UploadFile';
import { apiEntityNodes } from '@/services/business/entity';
import { apiModelDeploymentAdd } from '@/services/business/model';
import { isSuccessApi } from '@/utils/forApi';
@@ -291,7 +291,7 @@ const CreateForm: React.FC
= (props) => {
),
}}
>
-
@@ -309,6 +309,8 @@ const CreateForm: React.FC = (props) => {
icon: ,
name: 'business_logic_arr',
max: 1,
+ // initialValue: [],
+ accept: 'application/zip, application/gzip, application/x-tar',
}}
afterUploadFile={({ resp }) => {
setCurrFormData((data) => {
@@ -320,7 +322,6 @@ const CreateForm: React.FC = (props) => {
return { ...data, business_logic: '' };
});
}}
- openPreviewFile={true}
/>
{/* 参数配置 */}
@@ -343,7 +344,7 @@ const CreateForm: React.FC = (props) => {
return true;
}}
>
-
diff --git a/src/pages/Business/BusinessModel/components/updateForm.tsx b/src/pages/Business/BusinessModel/components/updateForm.tsx
index d4f4321..de88e32 100644
--- a/src/pages/Business/BusinessModel/components/updateForm.tsx
+++ b/src/pages/Business/BusinessModel/components/updateForm.tsx
@@ -1,4 +1,4 @@
-import { FormUploadDraggerToken } from '@/components/UploadFile';
+import { DraggerUpload } from '@/components/UploadFile';
import { apiEntityNodes } from '@/services/business/entity';
import { apiModelDeploymentEdit } from '@/services/business/model';
import { isSuccessApi } from '@/utils/forApi';
@@ -314,7 +314,7 @@ const UpdateForm: React.FC = (props) => {
),
}}
>
-
@@ -342,6 +342,7 @@ const UpdateForm: React.FC = (props) => {
},
]
: [],
+ accept: 'application/zip, application/gzip, application/x-tar',
}}
afterUploadFile={({ resp }) => {
setCurrFormData((data) => {
@@ -353,7 +354,6 @@ const UpdateForm: React.FC = (props) => {
return { ...data, business_logic: '' };
});
}}
- openPreviewFile={true}
/>
{/* 参数配置 */}
@@ -376,7 +376,7 @@ const UpdateForm: React.FC = (props) => {
return true;
}}
>
-
diff --git a/src/pages/Business/BusinessModel/index.tsx b/src/pages/Business/BusinessModel/index.tsx
index 238ff85..2658a6c 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-06-25 15:10:47
+ * @LastEditTime: 2024-07-18 11:15:26
* @FilePath: \general-ai-platform-web\src\pages\Node\BusinessModel\index.tsx
* @Description: 业务模型
* @交互说明
@@ -142,8 +142,9 @@ const BusinessModel: React.FC = () => {
renderDom: (
{
- console.log('删除成功');
- const resp = apiModelDeploymentDelete({ id: record.id });
+ // console.log('删除成功');
+ const resp = await apiModelDeploymentDelete({ id: record.model_id });
+ console.log(resp, 'apiModelDeploymentDelete');
if (isSuccessApi(resp)) {
reloadList();
message.success(
diff --git a/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx b/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx
index 2b0cdec..401ca3b 100644
--- a/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx
+++ b/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-30 10:02:29
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-06-20 11:30:56
+ * @LastEditTime: 2024-07-18 17:24:34
* @FilePath: \general-ai-platform-web\src\pages\Business\DeviceGroup\components\alarmSetForm.tsx
* @Description: 告警设置
* @交互说明
@@ -18,7 +18,7 @@ import {
ProFormGroup,
ProFormList,
ProFormRadio,
- ProFormSelect,
+ ProFormText,
} from '@ant-design/pro-components';
import { useIntl } from '@umijs/max';
import { Form, message } from 'antd';
@@ -40,12 +40,14 @@ const AlarmSetForm: React.FC = (props) => {
ways: [
{
label: '短信',
- value: is_sms === 1 && sms_to ? sms_to.split(',') : [],
+ value: sms_to,
+ // value: is_sms === 1 && sms_to ? sms_to.split(',') : [],
isChecked: is_sms === 1 ? ['1'] : [],
},
{
label: '邮件',
- value: is_email === 1 && email_to ? email_to.split(',') : [],
+ value: email_to,
+ // value: is_email === 1 && email_to ? email_to.split(',') : [],
isChecked: is_email === 1 ? ['1'] : [],
},
],
@@ -77,8 +79,11 @@ const AlarmSetForm: React.FC = (props) => {
const { ways, ...restParams } = values;
const is_sms = ways[0].value.length ? 1 : 0;
const is_email = ways[1].value.length ? 1 : 0;
- const sms_to = is_sms === 1 ? ways[0].value.join(',') : '';
- const email_to = is_email === 1 ? ways[1].value.join(',') : '';
+
+ const sms_to = is_sms === 1 ? ways[0].value : '';
+ const email_to = is_email === 1 ? ways[1].value : '';
+ // const sms_to = is_sms === 1 ? ways[0].value.join(',') : '';
+ // const email_to = is_email === 1 ? ways[1].value.join(',') : '';
let resp = await apiEntityNodesAlertConfig({
...restParams,
is_sms,
@@ -132,22 +137,31 @@ const AlarmSetForm: React.FC = (props) => {
{({ isChecked }) => {
console.log(isChecked, 'isChecked');
return (
- {
+ // // const resp = await postCurrentIP();
+ // const resp = ['用户A', '用户B', '用户C'];
+ // return resp?.map((v: any) => {
+ // return {
+ // label: v,
+ // value: v,
+ // };
+ // });
+ // }}
+ // />
+ {
- // const resp = await postCurrentIP();
- const resp = ['用户A', '用户B', '用户C'];
- return resp?.map((v: any) => {
- return {
- label: v,
- value: v,
- };
- });
- }}
+ placeholder={`${intl.formatMessage({
+ id: 'common.please_input',
+ defaultMessage: '$$$',
+ })}`}
/>
);
}}
diff --git a/src/pages/Business/DeviceGroup/components/createModelParams.tsx b/src/pages/Business/DeviceGroup/components/createModelParams.tsx
index 008e19f..060d2d7 100644
--- a/src/pages/Business/DeviceGroup/components/createModelParams.tsx
+++ b/src/pages/Business/DeviceGroup/components/createModelParams.tsx
@@ -1,5 +1,5 @@
import { CommButton } from '@/components/Button';
-import { FormUploadDraggerToken } from '@/components/UploadFile';
+import { DraggerUpload } from '@/components/UploadFile';
import { apiModelHubSync } from '@/services/business/model';
import {
@@ -150,7 +150,7 @@ const CreateModelParams: React.FC = (props) => {
return true;
}}
>
-
@@ -168,6 +168,8 @@ const CreateModelParams: React.FC = (props) => {
icon: ,
name: 'busi_conf_file_arr',
max: 1,
+ // initialValue: [],
+ accept: 'application/zip, application/gzip, application/x-tar',
}}
afterUploadFile={({ resp }) => {
setCurrFormData((data) => {
@@ -179,7 +181,6 @@ const CreateModelParams: React.FC = (props) => {
return { ...data, busi_conf_file: '' };
});
}}
- openPreviewFile={true}
/>
{/* 运行库选择 runtimeLib */}
@@ -343,7 +344,7 @@ const CreateModelParams: React.FC = (props) => {
return true;
}}
>
-
@@ -361,6 +362,7 @@ const CreateModelParams: React.FC = (props) => {
icon: ,
name: 'model_conf_file_arr',
max: 1,
+ accept: 'application/zip, application/gzip, application/x-tar',
}}
afterUploadFile={({ resp }) => {
setCurrFormData((data) => {
@@ -372,7 +374,6 @@ const CreateModelParams: React.FC = (props) => {
return { ...data, model_conf_file: '' };
});
}}
- openPreviewFile={true}
/>
diff --git a/src/pages/Model/ModelDetail/components/createForm.tsx b/src/pages/Model/ModelDetail/components/createForm.tsx
index 5987c61..7a2aaf9 100644
--- a/src/pages/Model/ModelDetail/components/createForm.tsx
+++ b/src/pages/Model/ModelDetail/components/createForm.tsx
@@ -310,7 +310,6 @@ const CreateForm: React.FC = (props) => {
name: 'config_file_arr',
max: 1,
// initialValue: [],
- // accept: 'application/zip, application/gzip, application/x-tar',
}}
afterUploadFile={({ resp }) => {
setCurrFormData((data) => {
diff --git a/src/pages/Project/BusinessInfo/components/accountPsw.tsx b/src/pages/Project/BusinessInfo/components/accountPsw.tsx
index 870dbd0..632062a 100644
--- a/src/pages/Project/BusinessInfo/components/accountPsw.tsx
+++ b/src/pages/Project/BusinessInfo/components/accountPsw.tsx
@@ -2,13 +2,15 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-23 17:46:47
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-06-25 13:42:26
+ * @LastEditTime: 2024-07-18 17:12:59
* @FilePath: \general-ai-platform-web\src\pages\Project\BusinessInfo\components\accountPsw.tsx
* @Description: 账号密码
*/
+import { apiEntityPwdcheck } from '@/services/business/entity';
+import { isSuccessApi } from '@/utils/forApi';
import { ProForm, ProFormText } from '@ant-design/pro-components';
import { FormattedMessage, useIntl } from '@umijs/max';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
type AccountPswProps = {
info: Record;
@@ -16,7 +18,20 @@ type AccountPswProps = {
const AccountPsw: React.FC = (props) => {
const [form] = ProForm.useForm(); // form 对象
const intl = useIntl();
-
+ const [passwordVisible, setPasswordVisible] = useState(false);
+ // 登录密码信息
+ async function loadPwdInfo() {
+ const { id } = props.commInfo;
+ const resp = await apiEntityPwdcheck({ id });
+ if (isSuccessApi(resp)) {
+ form.setFieldValue('pwd', resp?.data?.pwd);
+ }
+ }
+ const handleVisibilityToggle = (visible: boolean) => {
+ // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+ !passwordVisible && loadPwdInfo();
+ setPasswordVisible(visible);
+ };
useEffect(() => {
if (props.info) {
form.setFieldsValue(props.info);
@@ -60,7 +75,11 @@ const AccountPsw: React.FC = (props) => {
width="34.45vw"
label={}
name="pwd"
+ initialValue={'******'}
placeholder={'输入新密码'}
+ fieldProps={{
+ visibilityToggle: { visible: passwordVisible, onVisibleChange: handleVisibilityToggle },
+ }}
/>
diff --git a/src/pages/Project/BusinessInfo/components/algorithmCard.tsx b/src/pages/Project/BusinessInfo/components/algorithmCard.tsx
index e0d52e8..5483113 100644
--- a/src/pages/Project/BusinessInfo/components/algorithmCard.tsx
+++ b/src/pages/Project/BusinessInfo/components/algorithmCard.tsx
@@ -2,16 +2,30 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-08 16:57:30
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-09 09:54:36
+ * @LastEditTime: 2024-07-18 15:15:26
* @FilePath: \general-ai-manage\src\pages\Project\BusinessProject\components\businessCard.tsx
* @Description: 企业项目卡片
*/
import { ProCard } from '@ant-design/pro-components';
import { Image, theme } from 'antd';
import icon1 from '/public/images/bussnessInfo/icon1.png';
-import svg1 from '/public/images/bussnessInfo/model_1.png';
-
import icon2 from '/public/images/bussnessInfo/icon2.png';
+import industryClassification0 from '/public/images/industryClassification/0.png';
+import industryClassification1 from '/public/images/industryClassification/1.png';
+import industryClassification10 from '/public/images/industryClassification/10.png';
+import industryClassification11 from '/public/images/industryClassification/11.png';
+import industryClassification12 from '/public/images/industryClassification/12.png';
+import industryClassification13 from '/public/images/industryClassification/13.png';
+import industryClassification14 from '/public/images/industryClassification/14.png';
+import industryClassification15 from '/public/images/industryClassification/15.png';
+import industryClassification2 from '/public/images/industryClassification/2.png';
+import industryClassification3 from '/public/images/industryClassification/3.png';
+import industryClassification4 from '/public/images/industryClassification/4.png';
+import industryClassification5 from '/public/images/industryClassification/5.png';
+import industryClassification6 from '/public/images/industryClassification/6.png';
+import industryClassification7 from '/public/images/industryClassification/7.png';
+import industryClassification8 from '/public/images/industryClassification/8.png';
+import industryClassification9 from '/public/images/industryClassification/9.png';
type AlgorithmCardProps = {
info: Record;
@@ -20,6 +34,64 @@ type AlgorithmCardProps = {
const AlgorithmCard: React.FC = ({ info }) => {
const { token } = theme.useToken();
console.log(theme, 'AlgorithmCard_token', theme.useToken());
+ function renderIcon() {
+ let currUrl = industryClassification0;
+
+ switch (info?.classification_name) {
+ case 'IT服务':
+ currUrl = industryClassification1;
+ break;
+ case '管材':
+ currUrl = industryClassification2;
+ break;
+ case '建筑房地产':
+ currUrl = industryClassification3;
+ break;
+ case '教育':
+ currUrl = industryClassification4;
+ break;
+ case '金融行业':
+ currUrl = industryClassification5;
+ break;
+ case '零售':
+ currUrl = industryClassification6;
+ break;
+ case '能源矿采':
+ currUrl = industryClassification7;
+ break;
+ case '农林牧渔':
+ currUrl = industryClassification8;
+ break;
+ case '生活服务':
+ currUrl = industryClassification9;
+ break;
+ case '手机电子行业':
+ currUrl = industryClassification10;
+ break;
+ case '文化娱乐':
+ currUrl = industryClassification11;
+ break;
+ case '医疗':
+ currUrl = industryClassification12;
+ break;
+ case '运输物流':
+ currUrl = industryClassification13;
+ break;
+ case '政府':
+ currUrl = industryClassification14;
+ break;
+ case '制造业':
+ currUrl = industryClassification15;
+ break;
+ case '其他行业':
+ default:
+ currUrl = industryClassification0;
+ break;
+ }
+
+ return ;
+ }
+
return (
= ({ info }) => {
className="tag_type"
style={{
background:
- info.typeName === '机器学习'
+ info.model_type === '机器学习'
? 'linear-gradient( 180deg, #FFB21A 0%, #FF9B3E 100%)'
: 'linear-gradient(180deg, #21c7ff 0%, #428cff 100%)',
}}
>
- {info.typeName}
+ {info.model_type}