Merge branch 'develop' of http://192.168.10.28:3000/Yaxin/General-AI-Platform-Web into develop

src/locales/zh-CN/resource.ts

@@ -95,5 +95,6 @@ export const server_status: { [key: string]: string } = {
   'resource.server_status.table.rule.required.modelFkId': '模型为必填项',
   'resource.server_status.table.rule.required.path': '模型地址为必填项',
   'resource.server_status.table.list.add': '新建服务器',
+  'resource.server_status.table.list.editor': '编辑服务器',
   'resource.server_status.table.list.update': '更新模型版本',
 };

src/pages/Resource/ServerStatus/components/CreateForm.tsx

@@ -54,7 +54,13 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
         return true;
       }}
     >
-      <FormattedMessage id="resource.server_status.table.list.parameter" defaultMessage="$$$" />
+      <span style={{
+        display: 'inline-block',
+        fontWeight: 600,
+        marginBottom: 12
+      }}>
+        <FormattedMessage id="resource.server_status.table.list.parameter" defaultMessage="$$$" />
+      </span>
       <ProForm.Group>
         <ProFormText
           width={proFormItemStyleProps.column2Width}

src/pages/Resource/ServerStatus/components/UpdateForm.tsx

@@ -35,7 +35,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
     <ModalForm<API.BusinessImage>
       width={proFormModelWidth}
       title={intl.formatMessage({
-        id: 'resource.business_image.table.list.update',
+        id: 'resource.server_status.table.list.editor',
         defaultMessage: '$$$',
       })}
       open={props.updateModalOpen}
@@ -60,7 +60,13 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
         return true;
       }}
     >
-      <FormattedMessage id="resource.server_status.table.list.parameter" defaultMessage="$$$" />
+      <span style={{
+        display: 'inline-block',
+        fontWeight: 600,
+        marginBottom: 12
+      }}>
+        <FormattedMessage id="resource.server_status.table.list.parameter" defaultMessage="$$$" />
+      </span>
       <ProForm.Group>
         <ProFormText
           width={proFormItemStyleProps.column2Width}

src/pages/Resource/ServerStatus/index.tsx

@@ -96,7 +96,7 @@ const ServerStatus: React.FC = () => {
   const { confirm } = Modal;
   const showConfirm = (record: any) => {
     confirm({
-      title: record.status,
+      title: `确定删除${record.name}吗`,
       icon: <QuestionCircleFilled />,
       content: '确定删除服务器1吗？删除后将找不到此服务器，请谨慎操作.',
       okText: '确认',
@@ -112,14 +112,38 @@ const ServerStatus: React.FC = () => {
   };
 
   const dataTestList = [
-    { status: '在线' },
+    { 
-    { status: '在线' },
+      status: '在线' ,
-    { status: '离线' },
+      name: '服务器1'
-    { status: '离线' },
+    },
-    { status: '离线' },
+    { 
-    { status: '在线' },
+      status: '在线' ,
-    { status: '在线' },
+      name: '服务器2'
-    { status: '离线' },
+    },
+    { 
+      status: '在线' ,
+      name: '服务器3'
+    },
+    { 
+      status: '在线' ,
+      name: '服务器4'
+    },
+    { 
+      status: '在线' ,
+      name: '服务器5'
+    },
+    { 
+      status: '在线' ,
+      name: '服务器6'
+    },
+    { 
+      status: '在线' ,
+      name: '服务器7'
+    },
+    { 
+      status: '在线' ,
+      name: '服务器8'
+    },
   ].map((record, index) => {
     let currColor = 'default';
     switch (record.status) {

src/pages/System/ParameterSetting/index.tsx

@@ -37,22 +37,27 @@ const ParameterSetting: React.FC = () => {
             <ProCard
                 style={{ background: 'white' }}
                 bodyStyle={{
-                    padding: 40,
+                    padding: 20,
                     margin: 0,
                 }}
-                gutter={24}
+                // gutter={24}
-                wrap
+                // wrap
-                ghost
+                // ghost
             >
                 <ProForm
                     layout='vertical'
+                    style={{
+                        padding: '0 0px 0 20px',
+                        margin: 0,
+                        display: 'flex',
+                        justifyContent: 'space-between'
+                    }}
                     grid={true}
                     rowProps={{
                         gutter: 24
                     }}
                     submitter={false}
                 >
-
                     <ProForm.Item 
                         label={<FormattedMessage id="system.parameter.table.list.label" defaultMessage="$$$" />}
                         style={{