free-sun
/
DataCenter
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitea.anxinyun.cn/zhouxin/ReportCenter

master
ww664853070 2 years ago
parent
cf16f24304 c20d4ac18b
commit
702d562a54
4 changed files with 100 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      api/config.js
  2. 196
      web/client/src/layout/components/header/index.jsx
  3. 7
      web/client/src/sections/auth/containers/login.jsx
  4. 11
      web/config.js

10
api/config.js
View File

@ -57,16 +57,6 @@ const CLICKHOUST_HR = process.env.CLICKHOUST_HR || flags.clickHouseHr
console.log('RC_DB',RC_DB);
console.log('IOTA_REDIS_SERVER_HOST',IOTA_REDIS_SERVER_HOST);
console.log('IOTA_REDIS_SERVER_PORT',IOTA_REDIS_SERVER_PORT);
console.log('API_EMIS_URL',API_EMIS_URL);
console.log('QINIU_DOMAIN_QNDMN_RESOURCE',QINIU_DOMAIN_QNDMN_RESOURCE);
console.log('QINIU_BUCKET_RESOURCE',QINIU_BUCKET_RESOURCE);
console.log('QINIU_AK',QINIU_AK);
console.log('QINIU_SK',QINIU_SK);
console.log('CLICKHOUST_PEP_EMIS',CLICKHOUST_PEP_EMIS);
console.log('CLICKHOUST_HR',CLICKHOUST_HR);
if (
!RC_DB

196
web/client/src/layout/components/header/index.jsx
View File

@ -7,99 +7,91 @@ import { headerItems } from './contant';
import "./index.less";
const Header = (props) => {
const { dispatch, history, user, actions, socket, tochange } = props;
const { dispatch, history, user, actions, socket, tochange } = props;
return (
<>
<div id="top-slider">
<Nav
mode={"horizontal"}
onClick={({ itemKey }) => {
if (itemKey == "logout") {
dispatch(actions.auth.logout(user));
if (socket) {
socket.disconnect();
}
history.push(`/signin`);
}
}}
style={{
height: 48,
minWidth: 520,
background: '#1D2343',
backgroundSize: "100% 100%",
color: "white",
}}
header={{
logo: (
<div style={{ display: 'flex' }}>
<div style={{ marginLeft: 16, width: 24, height: 24 }}>
<img src="/assets/images/background/username.png" alt="" style={{ width: 24, marginRight: -10 }} />
</div>
<div style={{ fontFamily: 'YouSheBiaoTiHei', fontSize: 18, marginLeft: 12 }}>
数据中心
</div>
</div>
// <img
// src="/assets/images/install/long_logo.png"
// style={{ display: "inline-block", width: 200, height: 40, marginLeft: -24 }}
// />
),
// text: (
// <>
return (
<>
<div id="top-slider">
<Nav
mode={"horizontal"}
onClick={({ itemKey }) => {
if (itemKey == "logout") {
dispatch(actions.auth.logout(user));
if (socket) {
socket.disconnect();
}
history.push(`/signin`);
}
}}
style={{
height: 48,
minWidth: 520,
background: '#1D2343',
backgroundSize: "100% 100%",
color: "white",
}}
header={{
logo: (
<div style={{ display: 'flex' }}>
<div style={{ marginLeft: 16, width: 24, height: 24 }}>
<img src="/assets/images/background/username.png" alt="" style={{ width: 24, marginRight: -10 }} />
</div>
<div style={{ fontFamily: 'YouSheBiaoTiHei', fontSize: 18, marginLeft: 12 }}>
数据中心
</div>
</div>
// <img
// src="/assets/images/install/long_logo.png"
// style={{ display: "inline-block", width: 200, height: 40, marginLeft: -24 }}
// />
),
// text: (
// <>
// {/* <SplitButtonGroup style={{ marginLeft: 10 }} aria-label="项目操作按钮组"> */}
// <Button theme="solid" type="primary" style={{ width: 52, height: 24, background: '#005ABD' }}>全局</Button>
// {/* <Dropdown onVisibleChange={(v) => { }} menu={{}} trigger="click" position="bottomRight"> */}
// <Button style={{ width: 16, height: 24, background: '#005ABD' }} theme="solid" type="primary" icon={<IconTreeTriangleDown />}></Button>
// {/* </Dropdown> */}
// {/* </SplitButtonGroup> */}
// </>
// ),
}}
footer={
<>
{headerItems.map((item, index) => {
if (item.hasOwnProperty('items')) {
return (
<Nav.Sub
key={index + 'a'}
itemKey={item.itemKey}
text={item.text}
dropdownStyle={{ color: '#F2F3F5' }}
>
{item.hasOwnProperty('items') && item.items.map((ite, idx) => (
<Nav.Item key={idx + 'd'} itemKey={ite.itemKey} text={ite.text} onClick={() => { tochange(ite); }} />
))}
</Nav.Sub>
)
}
else {
return (
<div key='console' style={{ display: 'inline-flex' }}>
<img src="/assets/images/background/console.png" style={{ width: 24, marginRight: -10 }} />
<Nav.Item key={index + 'a'} itemKey={item.itemKey} text={item.text} onClick={() => { tochange(item) }} />
</div>
// {/* <SplitButtonGroup style={{ marginLeft: 10 }} aria-label="项目操作按钮组"> */}
// <Button theme="solid" type="primary" style={{ width: 52, height: 24, background: '#005ABD' }}>全局</Button>
// {/* <Dropdown onVisibleChange={(v) => { }} menu={{}} trigger="click" position="bottomRight"> */}
// <Button style={{ width: 16, height: 24, background: '#005ABD' }} theme="solid" type="primary" icon={<IconTreeTriangleDown />}></Button>
// {/* </Dropdown> */}
// {/* </SplitButtonGroup> */}
// </>
// ),
}}
footer={
<>
{headerItems.map((item, index) => {
if (item.hasOwnProperty('items')) {
return (
<Nav.Sub
key={index + 'a'}
itemKey={item.itemKey}
text={item.text}
dropdownStyle={{ color: '#F2F3F5' }}
>
{item.hasOwnProperty('items') && item.items.map((ite, idx) => (
<Nav.Item key={idx + 'd'} itemKey={ite.itemKey} text={ite.text} onClick={() => { tochange(ite); }} />
))}
</Nav.Sub>
)
}
else {
return (
<div key='console' style={{ display: 'inline-flex' }}>
<img src="/assets/images/background/console.png" style={{ width: 24, marginRight: -10 }} />
<Nav.Item key={index + 'a'} itemKey={item.itemKey} text={item.text} onClick={() => { tochange(item) }} />
</div>
)
}
})}
{/* <div style={{ display: 'flex', alignItems: 'center' }}>
<div style={{ marginLeft: 16, width: 24, height: 24 }}>
<img src="/assets/images/background/username.png" alt="" style={{ width: '100%', height: '100%' }} />
</div>
<div style={{ color: '#92CBFF', fontSize: 12, marginLeft: 10, cursor: "pointer" }} onClick={() => {
dispatch(actions.auth.logout(user));
if (socket) {
socket.disconnect();
}
history.push(`/signin`);
}}>
退出
</div>
</div> */}
)
}
})}
<div style={{ display: 'flex', alignItems: 'center' }}>
<div style={{ marginLeft: 16, width: 24, height: 24 }}>
<img src="/assets/images/background/username.png" alt="" style={{ width: '100%', height: '100%' }} />
</div>
<div style={{ color: '#92CBFF', fontSize: 12, marginLeft: 10, cursor: "pointer" }}>{user?.name}</div>
</div>
{/* <Nav.Sub
{/* <Nav.Sub
itemKey={"user"}
text={
<div
@ -145,21 +137,21 @@ const Header = (props) => {
退出
</div>
</Nav.Sub> */}
</>
}
/>
</div>
</>
);
</>
}
/>
</div>
</>
);
};
function mapStateToProps(state) {
const { global, auth, webSocket } = state;
return {
actions: global.actions,
user: auth.user,
socket: webSocket.socket,
};
function mapStateToProps (state) {
const { global, auth, webSocket } = state;
return {
actions: global.actions,
user: auth.user,
socket: webSocket.socket,
};
}
export default connect(mapStateToProps)(Header);

7
web/client/src/sections/auth/containers/login.jsx
View File

@ -8,7 +8,7 @@ import { IconLock, IconUser } from '@douyinfe/semi-icons';
import '../style.less'
const Login = props => {
const { dispatch, user, error, actions, apiRoot, isRequesting } = props
const { dispatch, user, error, actions, apiRoot, isRequesting,webPepUrl } = props
const form = useRef();
useEffect(() => {
@ -23,6 +23,8 @@ const Login = props => {
dispatch(push('/businessManagement/pmReport/reserveItemsReporting'));
localStorage.setItem('poms_open_sider', JSON.stringify(["pmReport"]))
localStorage.setItem('poms_selected_sider', JSON.stringify(["businessManagement"]))
}else{
window.location.href = `${webPepUrl}/signin`
}
}, [user])
@ -110,7 +112,8 @@ function mapStateToProps(state) {
error: auth.error,
actions: global.actions,
apiRoot: global.apiRoot,
isRequesting: auth.isRequesting
isRequesting: auth.isRequesting,
webPepUrl: global.webPepUrl,
}
}

11
web/config.js
View File

@ -28,7 +28,7 @@ const flags = args.parse(process.argv);
const API_URL = process.env.API_URL || flags.apiUrl;
const API_DC_URL = process.env.API_DC_URL || flags.apiHrUrl;
const FS_PEP_DOMAIN = process.FS_REPORT_DOMAIN || flags.domain;
const FS_PEP_DOMAIN = process.env.FS_PEP_DOMAIN || flags.domain;
const WEB_PEP_URL = process.env.WEB_PEP_URL || flags.webPepUrl;
// 七牛
@ -40,15 +40,6 @@ const ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE = process.env.ANXINCLOUD_QINIU_DOMA
const ANXINCLOUD_PM_SERVICES = process.env.ANXINCLOUD_PM_SERVICES || flags.pmrs;
console.log('API_URL',API_URL);
console.log('API_DC_URL',API_DC_URL);
console.log('WEB_PEP_URL',WEB_PEP_URL);
console.log('FS_PEP_DOMAIN',FS_PEP_DOMAIN);
console.log('ANXINCLOUD_QINIU_AK',ANXINCLOUD_QINIU_AK);
console.log('ANXINCLOUD_QINIU_SK',ANXINCLOUD_QINIU_SK);
console.log('ANXINCLOUD_QINIU_BUCKET_RESOURCE',ANXINCLOUD_QINIU_BUCKET_RESOURCE);
console.log('ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE',ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE);
if (
!API_URL
|| !API_DC_URL

Write Preview
Loading…
Cancel
Save