From c873ac2af89802a4ef750248b62cc00beb65e65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Fri, 24 Jan 2025 14:08:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=99=BB=E5=BD=95=E3=80=81he?=
 =?UTF-8?q?ader=20cont.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.css                                   |   1 +
 src/font/font.css                             |   5 +
 src/font/youshebiaotihei-2-webfont.woff2      | Bin 0 -> 3816 bytes
 src/forge/Head/Header.js                      |   6 +
 src/forge/Head/img/logo.png                   | Bin 8426 -> 3220 bytes
 src/modules/loginRegister/LoginNew.jsx        | 126 +++++-----
 .../loginRegister/LoginRegisterPageNew.scss   |   2 +
 src/modules/loginRegister/RegisterNew.jsx     | 238 +++++++++---------
 src/modules/tpm/TPMIndex.css                  |  14 +-
 src/modules/tpm/TPMIndexHOC.js                |   2 +-
 10 files changed, 207 insertions(+), 187 deletions(-)
 create mode 100644 src/font/font.css
 create mode 100644 src/font/youshebiaotihei-2-webfont.woff2

diff --git a/src/App.css b/src/App.css
index 2abbaf5e1..9b0b3741f 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,3 +1,4 @@
+@import url(./font/font.css);
 .App {
   text-align: center;
 }
diff --git a/src/font/font.css b/src/font/font.css
new file mode 100644
index 000000000..c9a06976c
--- /dev/null
+++ b/src/font/font.css
@@ -0,0 +1,5 @@
+/* 导航栏 */
+@font-face {
+  font-family: "YouSheBiaoTiHei";
+  src: url('./youshebiaotihei-2-webfont.woff2');
+}
\ No newline at end of file
diff --git a/src/font/youshebiaotihei-2-webfont.woff2 b/src/font/youshebiaotihei-2-webfont.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..b9d9abd7af4cf367e2fe75b2dbe22c5a9ebcaf2c
GIT binary patch
literal 3816
zcmV<E4j1uvPew8T0RR9101oH?5C8xG02)*P01k-&0RR9100000000000000000000
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

literal 0
HcmV?d00001

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 70a9d681d..8a578834e 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -12,6 +12,7 @@ import { getOrzCompanyList } from '../../forge/Information/api';
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
 import CheckProfile from '../Component/ProfileModal/Profile';
+import logo from './img/logo.png'
 
 import './header.scss';
 const { SubMenu } = Menu
@@ -334,6 +335,11 @@ class NewHeader extends Component {
     return (
       <div className={publicNav ? `newHeaders publicNav`:`newHeaders`} id="nHeader">
         <div className="headerContent">
+          <div className="title">
+            <img src={logo} alt="" style={{width: '32px'}} />
+            <span className='font32 ml15'>支持持续成长演化的软件平台</span>
+            <span className='font24 ml15'>群智开发</span>
+          </div>
           {isRender === true ?
             <LoginDialog
               {...this.props}
diff --git a/src/forge/Head/img/logo.png b/src/forge/Head/img/logo.png
index 121cc04bbf4f3f5e5564c4134ea058fc9ad77c7b..2ceb700cb1e89c63d51cac5b0fb469c209757d8a 100644
GIT binary patch
literal 3220
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
GLSTZU?=ay2

literal 8426
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
M07*qoM6N<$f>A#T0{{R3

diff --git a/src/modules/loginRegister/LoginNew.jsx b/src/modules/loginRegister/LoginNew.jsx
index 76c82075b..1cc5ee36e 100644
--- a/src/modules/loginRegister/LoginNew.jsx
+++ b/src/modules/loginRegister/LoginNew.jsx
@@ -76,71 +76,69 @@ function Login(props){
 
 
   return(
-    <div>
-      <div className="right_cont login_content">
-        <div className="login_register_head mb60">
-          <p>欢迎登录 <span className="head_blue">群智开发</span></p>
-        </div>
-        <p className = {message?"message active mb10":"message"}>{message}</p>
-        <Form className="login-form">
-          <Form.Item>
-            {getFieldDecorator('username',{
-              rules:[
-                {
-                  required:true,  
-                  message:"请输入手机号/邮箱/用户名"
-                }
-              ],
-              validateTrigger:"onBlur",
-            })(<Input className="account" placeholder="请输入手机号/邮箱/用户名" prefix={<div className="input_icon"></div>} />)}
-          </Form.Item>
-
-          <Form.Item>
-            {getFieldDecorator('password', {
-              rules: [
-                {
-                  required:true,
-                  message:"请输入登录密码"
-                }
-              ],
-              validateTrigger:"onBlur",
-            })(
-              <Input.Password className="psd" placeholder="请输入登录密码" onBlur={clear} onChange={clear} prefix={<div className="input_icon"></div>} />,
-            )}
-          </Form.Item>
-
-          <div className="login_register_head login mb60">
-            <Form.Item>
-              {getFieldDecorator('remember', {
-                valuePropName: 'checked',
-                initialValue: cookie.load('autologin'),
-              })(<Checkbox>下次自动登录</Checkbox>)}
-            </Form.Item>
-            {/* <Link to="/resetPassword" className="goResetPsdBut">忘记密码？</Link> */}
-          </div>
-          <Button type="primary" htmlType="submit" onClick={handleSubmit} className="login_register_cofBut">登录</Button>
-        </Form>
-        <div className="link_span">没有账号？<Link to={`/register`}>去注册</Link></div>
-
-        {
-          // setting && setting.third_party_new && setting.third_party_new.length > 0 ?
-          // <p className="quick_logon">
-          //   <p className="quick_logon_p"></p>
-          //   <span className={"startlogin"}>&nbsp;快速登录&nbsp;</span>
-          //   {setting.third_party_new.map((item,key)=>{
-          //     return(
-          //     <a href={`${item.url}`} className="ml15 mr15">
-          //       <Tooltip title={`使用${item.name === "qq" ? "QQ":item.name === "wechat" ? "微信" : item.name}账号登录`}>
-          //         <img src={item.name === "educoder" ? educoderLogo : item.name === "qq" ? qqlogo : item.name === "wechat" ? WeChatlogo :  item.name === "gitee" ? giteelogo : item.name === "github" ? githublogo : ""} width="46px" alt={`${item.name}登录`}/>
-          //       </Tooltip>
-          //     </a>
-          //     )
-          //   })
-          //   }
-          // </p>
-          // <OtherLogin />
-        }
+    <div className="right_cont login_content">
+      <div className="login_register_head mb60">
+        <p>欢迎登录 <span className="head_blue">群智开发</span></p>
       </div>
+      <p className = {message?"message active mb10":"message"}>{message}</p>
+      <Form className="login-form">
+        <Form.Item>
+          {getFieldDecorator('username',{
+            rules:[
+              {
+                required:true,  
+                message:"请输入手机号/邮箱/用户名"
+              }
+            ],
+            validateTrigger:"onBlur",
+          })(<Input className="account" placeholder="请输入手机号/邮箱/用户名" prefix={<div className="input_icon"></div>} />)}
+        </Form.Item>
+
+        <Form.Item>
+          {getFieldDecorator('password', {
+            rules: [
+              {
+                required:true,
+                message:"请输入登录密码"
+              }
+            ],
+            validateTrigger:"onBlur",
+          })(
+            <Input.Password className="psd" placeholder="请输入登录密码" onBlur={clear} onChange={clear} prefix={<div className="input_icon"></div>} />,
+          )}
+        </Form.Item>
+
+        <div className="login_register_head login mb60">
+          <Form.Item>
+            {getFieldDecorator('remember', {
+              valuePropName: 'checked',
+              initialValue: cookie.load('autologin'),
+            })(<Checkbox>下次自动登录</Checkbox>)}
+          </Form.Item>
+          {/* <Link to="/resetPassword" className="goResetPsdBut">忘记密码？</Link> */}
+        </div>
+        <Button type="primary" htmlType="submit" onClick={handleSubmit} className="login_register_cofBut">登录</Button>
+      </Form>
+      <div className="link_span">没有账号？<Link to={`/register`}>去注册</Link></div>
+
+      {
+        // setting && setting.third_party_new && setting.third_party_new.length > 0 ?
+        // <p className="quick_logon">
+        //   <p className="quick_logon_p"></p>
+        //   <span className={"startlogin"}>&nbsp;快速登录&nbsp;</span>
+        //   {setting.third_party_new.map((item,key)=>{
+        //     return(
+        //     <a href={`${item.url}`} className="ml15 mr15">
+        //       <Tooltip title={`使用${item.name === "qq" ? "QQ":item.name === "wechat" ? "微信" : item.name}账号登录`}>
+        //         <img src={item.name === "educoder" ? educoderLogo : item.name === "qq" ? qqlogo : item.name === "wechat" ? WeChatlogo :  item.name === "gitee" ? giteelogo : item.name === "github" ? githublogo : ""} width="46px" alt={`${item.name}登录`}/>
+        //       </Tooltip>
+        //     </a>
+        //     )
+        //   })
+        //   }
+        // </p>
+        // <OtherLogin />
+      }
     </div>
   )
 
diff --git a/src/modules/loginRegister/LoginRegisterPageNew.scss b/src/modules/loginRegister/LoginRegisterPageNew.scss
index ceb4b1aab..b81a2fc98 100644
--- a/src/modules/loginRegister/LoginRegisterPageNew.scss
+++ b/src/modules/loginRegister/LoginRegisterPageNew.scss
@@ -49,10 +49,12 @@
     }
   }
   .right_cont {
+    height: 100%;
     width: 50%;
     margin-left: auto;
     display: flex;
     flex-direction: column;
+    justify-content: space-between;
     .login_register_head {
       font-family: alibaba-medium;
       color: #283444;
diff --git a/src/modules/loginRegister/RegisterNew.jsx b/src/modules/loginRegister/RegisterNew.jsx
index 56c939b49..c7967c8e0 100644
--- a/src/modules/loginRegister/RegisterNew.jsx
+++ b/src/modules/loginRegister/RegisterNew.jsx
@@ -225,127 +225,125 @@ function Register(props){
   }
 
   return(
-    <div>
-      <div className="right_cont Register_content">
-        <div className="login_register_head mb30">
-          <p>欢迎注册 <span className="head_blue">群智开发</span></p>
-        </div>
-        <div className="registerNav mb28 font-16">
-          <a className={`type ${registerType ? '' : 'activeRegisterNav'}`} onClick={()=>{changeRegisterType(0)}}>手机号注册</a>
-          <a className={`type ${registerType ? 'activeRegisterNav' : ''} ml50`} onClick={()=>{changeRegisterType(1)}}>邮箱注册</a>
-        </div>
-        <p className={mess ? "message active" : "message"}>{mess}</p>
-        <Form className="login-form">
-          <Form.Item>
-            {getFieldDecorator('register_username',{
-              rules:[
-                {
-                  transform: (value)=>{return value.trim()}
-                },
-                {
-                  required:true,
-                  message:"请输入用户名"
-                },
-                {
-                  pattern: /^[a-zA-Z]/,
-                  message: "用户名必须以字母开头"
-                },
-                {
-                  pattern: /[a-zA-Z0-9]$/,
-                  message: "用户名只能使用英文字母和数字"
-                },
-                {
-                  pattern: /^[^\s]*$/,
-                  message: "用户名不能包含空格"
-                },
-                {
-                  min: 4,
-                  max: 15,
-                  message: "用户名长度为4到15个字符"
-                },
-                {
-                  validator: (rule, value, callback) => { usernameConfirm(rule, value, callback) }
-                }
-              ],
-              validateTrigger:"onBlur",
-              validateFirst: true,
-            })(<Input className="account" autoFocus placeholder="请输入4-15位用户名，以字母开头，只能使用字母和数字" autoComplete="off" prefix={<div className="input_icon"></div>} />)}
-          </Form.Item>
-          <Form.Item>
-            {getFieldDecorator('email',{
-              rules:[
-                {
-                  validator: (rule, value, callback) => { emailConfirm(rule, value, callback) }
-                }
-              ],
-              validateTrigger:"onBlur",
-              validateFirst: true,
-            })(<Input className={`${registerType ? 'email' : 'phone'}`} placeholder={`请输入${registerType ? '邮箱地址' : '手机号'}`} autoComplete="off" prefix={<div className="input_icon"></div>} />)}
-          </Form.Item>
-
-          {/* <Form.Item>
-            <div className="login_register_head">
-              {getFieldDecorator('captcha', {
-                rules: [{
-                  required: true,
-                  message: "请输入验证码"
-                }],
-                validateTrigger: "onBlur",
-              })(
-                <Input className="captcha" placeholder="请输入验证码" autoComplete="off"/>
-              )}
-              <Button className={getCaptchaBut ? 'codeBut':'codeBut disable'} disabled={!getCaptchaBut} onClick={getCaptcha}>{getCaptchaBut || (!getCaptchaBut && !countDown)?"获取验证码":`重发(${secondsStr}s)`}</Button>
-            </div>
-          </Form.Item> */}
-
-          <Form.Item>
-            {getFieldDecorator('register_psd',{
-              rules:[
-                {
-                  validator: (rule, value, callback) => { comfirmPassWord(rule, value, callback, 1) }
-                },
-                {
-                  validator: (rule, value, callback) => { checkPassWord(rule, value, callback) }
-                }
-              ],
-              validateTrigger:"onBlur",
-              validateFirst: true,
-            })(<Input.Password className="register_psd" placeholder="请输入8-16位密码，区分大小写、不能使用空格" onBlur={clear}  onChange={clear} autoComplete="new-password" prefix={<div className="input_icon"></div>} />)}
-          </Form.Item>
-          {/* <span className="password_tips" style={{display:tipVisable?"none":"block"}}>请输入8-16位密码，区分大小写、不能使用空格</span> */}
-
-          <Form.Item>
-            {getFieldDecorator('psdComfirm', {
-              rules: [
-                {
-                  required: true,
-                  message: "请确认登录密码"
-                },
-                {
-                  validator: (rule, value, callback) => { comfirmPassWord(rule, value, callback, 2) }
-                }
-              ],
-              validateTrigger: "onBlur",
-              validateFirst: true,
-            })(<Input.Password className="psdComfirm" placeholder="请确认登录密码" onBlur={clear} onChange={clear} autoComplete="new-password" prefix={<div className="input_icon"></div>} />)}
-          </Form.Item>
-
-          {/* <Form.Item className="register_last_form">
-            {getFieldDecorator('agreement', {
-              valuePropName: 'checked',
-              initialValue: false,
-              rules: [
-                {
-                  validator: (rule, value, callback) => { comfirmRead(rule, value, callback) }
-                }
-              ],
-            })(<Checkbox className="link_span">我已阅读并接受<a className="login-form-forgot" href="https://forum.trustie.net/forums/5029/detail" target="_blank">《软件发展新技术服务协议条款》</a></Checkbox>)}
-          </Form.Item> */}
-          <Button type="primary" htmlType="submit" className="login_register_cofBut" onClick={handleSubmit}>注册</Button>
-        </Form>
-        <div className="link_span">已有账号，<Link to={`/login`}>立即登录</Link></div>
-        {/* <OtherLogin /> */}
+    <div className="right_cont Register_content">
+      <div className="login_register_head mb30">
+        <p>欢迎注册 <span className="head_blue">群智开发</span></p>
       </div>
+      <div className="registerNav mb28 font-16">
+        <a className={`type ${registerType ? '' : 'activeRegisterNav'}`} onClick={()=>{changeRegisterType(0)}}>手机号注册</a>
+        <a className={`type ${registerType ? 'activeRegisterNav' : ''} ml50`} onClick={()=>{changeRegisterType(1)}}>邮箱注册</a>
+      </div>
+      <p className={mess ? "message active" : "message"}>{mess}</p>
+      <Form className="login-form">
+        <Form.Item>
+          {getFieldDecorator('register_username',{
+            rules:[
+              {
+                transform: (value)=>{return value.trim()}
+              },
+              {
+                required:true,
+                message:"请输入用户名"
+              },
+              {
+                pattern: /^[a-zA-Z]/,
+                message: "用户名必须以字母开头"
+              },
+              {
+                pattern: /[a-zA-Z0-9]$/,
+                message: "用户名只能使用英文字母和数字"
+              },
+              {
+                pattern: /^[^\s]*$/,
+                message: "用户名不能包含空格"
+              },
+              {
+                min: 4,
+                max: 15,
+                message: "用户名长度为4到15个字符"
+              },
+              {
+                validator: (rule, value, callback) => { usernameConfirm(rule, value, callback) }
+              }
+            ],
+            validateTrigger:"onBlur",
+            validateFirst: true,
+          })(<Input className="account" autoFocus placeholder="请输入4-15位用户名，以字母开头，只能使用字母和数字" autoComplete="off" prefix={<div className="input_icon"></div>} />)}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('email',{
+            rules:[
+              {
+                validator: (rule, value, callback) => { emailConfirm(rule, value, callback) }
+              }
+            ],
+            validateTrigger:"onBlur",
+            validateFirst: true,
+          })(<Input className={`${registerType ? 'email' : 'phone'}`} placeholder={`请输入${registerType ? '邮箱地址' : '手机号'}`} autoComplete="off" prefix={<div className="input_icon"></div>} />)}
+        </Form.Item>
+
+        {/* <Form.Item>
+          <div className="login_register_head">
+            {getFieldDecorator('captcha', {
+              rules: [{
+                required: true,
+                message: "请输入验证码"
+              }],
+              validateTrigger: "onBlur",
+            })(
+              <Input className="captcha" placeholder="请输入验证码" autoComplete="off"/>
+            )}
+            <Button className={getCaptchaBut ? 'codeBut':'codeBut disable'} disabled={!getCaptchaBut} onClick={getCaptcha}>{getCaptchaBut || (!getCaptchaBut && !countDown)?"获取验证码":`重发(${secondsStr}s)`}</Button>
+          </div>
+        </Form.Item> */}
+
+        <Form.Item>
+          {getFieldDecorator('register_psd',{
+            rules:[
+              {
+                validator: (rule, value, callback) => { comfirmPassWord(rule, value, callback, 1) }
+              },
+              {
+                validator: (rule, value, callback) => { checkPassWord(rule, value, callback) }
+              }
+            ],
+            validateTrigger:"onBlur",
+            validateFirst: true,
+          })(<Input.Password className="register_psd" placeholder="请输入8-16位密码，区分大小写、不能使用空格" onBlur={clear}  onChange={clear} autoComplete="new-password" prefix={<div className="input_icon"></div>} />)}
+        </Form.Item>
+        {/* <span className="password_tips" style={{display:tipVisable?"none":"block"}}>请输入8-16位密码，区分大小写、不能使用空格</span> */}
+
+        <Form.Item>
+          {getFieldDecorator('psdComfirm', {
+            rules: [
+              {
+                required: true,
+                message: "请确认登录密码"
+              },
+              {
+                validator: (rule, value, callback) => { comfirmPassWord(rule, value, callback, 2) }
+              }
+            ],
+            validateTrigger: "onBlur",
+            validateFirst: true,
+          })(<Input.Password className="psdComfirm" placeholder="请确认登录密码" onBlur={clear} onChange={clear} autoComplete="new-password" prefix={<div className="input_icon"></div>} />)}
+        </Form.Item>
+
+        {/* <Form.Item className="register_last_form">
+          {getFieldDecorator('agreement', {
+            valuePropName: 'checked',
+            initialValue: false,
+            rules: [
+              {
+                validator: (rule, value, callback) => { comfirmRead(rule, value, callback) }
+              }
+            ],
+          })(<Checkbox className="link_span">我已阅读并接受<a className="login-form-forgot" href="https://forum.trustie.net/forums/5029/detail" target="_blank">《软件发展新技术服务协议条款》</a></Checkbox>)}
+        </Form.Item> */}
+        <Button type="primary" htmlType="submit" className="login_register_cofBut" onClick={handleSubmit}>注册</Button>
+      </Form>
+      <div className="link_span">已有账号，<Link to={`/login`}>立即登录</Link></div>
+      {/* <OtherLogin /> */}
     </div>
   )
 }
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index cad76a457..0c1f51d0c 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -36,11 +36,21 @@ body>.-task-title {
 }
 .headerContent{
   margin:0px auto;
-  padding:0px 30px;
   display: flex;
   align-items: center;
   height: 100%;
-  justify-content: flex-end;
+  justify-content: space-between;
+  .title {
+    display: flex;
+    align-items: center;
+    font-family: YouSheBiaoTiHei;
+  }
+  .font32 {
+    font-size: 32px;
+  }
+  .font24 {
+    font-size: 24px;
+  }
 }
 .globalSpin {
   max-height: 700px !important;
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 4010dd96d..d3209bcdc 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -398,7 +398,7 @@ export function TPMIndexHOC(WrappedComponent) {
 					/> : ""}
 					{npsModalVisible && <NpsModal closeNpsModal={()=>{this.closeNpsModal()}} npsActionType={npsActionType} npsActionId={npsActionId}/>}
 					{ !pathCheck && <Header {...this.state} {...this.props} {...common} publicNav={publicNav}></Header> }
-					{!publicNav && <div style={{height:"7vh"}}></div> }
+					{/* {!publicNav && <div style={{height:"7vh"}}></div> } */}
 					<div className="flexTop">
 						{/* { !(this.hideNavPath(path)) && 
 							<ul className="navBox">