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

副标题

dev
deartibers 2 years ago
parent
a634e97e56
commit
b09f9cee27
4 changed files with 65 additions and 54 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. 6
      web/client/src/layout/components/sider/index.less
  2. 6
      web/client/src/sections/install/actions/system.js
  3. 11
      web/client/src/sections/install/containers/roles.jsx
  4. 96
      web/client/src/sections/install/containers/system.jsx

6
web/client/src/layout/components/sider/index.less
View File

@ -9,6 +9,12 @@
.semi-navigation-item-icon{
color:#F2F3F5
}
.semi-navigation-item-inner{
font-family: YouSheBiaoTiHei;
font-size: 16px;
letter-spacing:2px;
font-weight: 400;
}
.semi-navigation-sub-title-selected{
background: #1D2343;
.semi-navigation-item-icon{

6
web/client/src/sections/install/actions/system.js
View File

@ -21,7 +21,7 @@ export function getProjectAnxincloud (query) {//获取安心云项目
query: query,
url: `${ApiTable.getProjectAnxincloud}`,
msg: { option: "获取安心云项目" },
reducer: { name: "ProjectPoms", params: { noClear: true } },
reducer: { name: "ProjectAnxincloud", params: { noClear: true } },
});
}
export function getProjectPmanage (query) {//获取PEP项目管理项目
@ -32,7 +32,7 @@ export function getProjectPmanage (query) {//获取PEP项目管理项目
query: query,
url: `${ApiTable.getProjectPmanage}`,
msg: { option: "获取PEP项目管理项目" },
reducer: { name: "ProjectPoms", params: { noClear: true } },
reducer: { name: "ProjectPmanage", params: { noClear: true } },
});
}
export function getProjectAppList (query) {//获取应用列表
@ -43,7 +43,7 @@ export function getProjectAppList (query) {//获取应用列表
query: query,
url: `${ApiTable.getProjectAppList}`,
msg: { option: "获取应用列表" },
reducer: { name: "ProjectPoms", params: { noClear: true } },
reducer: { name: "ProjectAppList", params: { noClear: true } },
});
}
export function postProjectBind (data) {//绑定安心云、项目管理项目

11
web/client/src/sections/install/containers/roles.jsx
View File

@ -300,7 +300,7 @@ const Roles = (props) => {
let anxinErrorList = []
for (let i = 0; i < row.correlationProject.length; i++) {
if (row.correlationProject[i].del) {
anxinErrorList.push(row.correlationProject[i].pepProjectName||row.correlationProject[i].name)
anxinErrorList.push(row.correlationProject[i].pepProjectName || row.correlationProject[i].name)
}
else {
myanxinArr.push(row.correlationProject[i].id)
@ -396,6 +396,9 @@ const Roles = (props) => {
<div style={{ fontFamily: "YouSheBiaoTiHei", fontSize: 24, color: '#101531', marginLeft: 8 }}>管理员设置</div>
<div style={{ marginLeft: 6, fontSize: 12, color: '#969799', fontFamily: "DINExp", }}>ADMINISTRATOR SETTING</div>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20, marginTop: 5 }}>
<div style={{ fontSize: 12, color: '#8B8B8B' }}>平台最多支持5个管理员权限的关系绑定，该权限可对系统所有功能和项目进行设置和管理，包括系统权限、映射关系、工单配置等敏感操作，请谨慎使用该权限。</div>
</div>
<div style={{ margintop: 15, overflow: 'auto' }}>
<div style={{ display: 'inline-flex' }}>
{
@ -547,7 +550,7 @@ const Roles = (props) => {
</div>
</div>
<Skeleton
loading={false}
loading={loading}
active={true}
placeholder={SkeletonScreen()}
>
@ -617,9 +620,9 @@ const Roles = (props) => {
}
function mapStateToProps (state) {
const { auth, global, members } = state;
const { auth, global, OrganizationDeps } = state;
return {
// loading: members.isRequesting,
loading: OrganizationDeps.isRequesting,
user: auth.user,
actions: global.actions,
// members: members.data,

96
web/client/src/sections/install/containers/system.jsx
View File

@ -87,6 +87,48 @@ const Example = (props) => {
return index + 1;
},
},
{
title: 'PEP项企项目名称',
dataIndex: "pepProjectName",
key: 'pepProjectName',
render: (_, row) => {
return (
<div style={{ display: 'flex', alignItems: 'center' }}>
{
row.pepProjectIsDelete == 1 ? (
<Tooltip content={'失效,项目已在【项企PEP】中被删除!'}>
<div style={{ marginRight: 5 }}>
<img src="/assets/images/install/risk.png" alt="" style={{ height: 24, width: 24, }} />
</div>
</Tooltip>) : ('')
}
<Tooltip content={row.pepProjectName || row.name}>
<div style={{ color: row.pepProjectIsDelete == 1 ? 'rgb(249, 57, 32)' : '', width: row?.pepProjectName?.length > 7 || row?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
{row.pepProjectName || row.name}
</div>
</Tooltip>
{
row.pepProjectName ? (
<div style={{
height: 18, marginLeft: 4,
background: 'linear-gradient(180deg, #EBF5FF 0%, #EBF5FF 0%, #D3E8FF 100%)',
borderRadius: 2, display: 'flex', alignItems: 'center'
}}>
<div>
<img src="/assets/images/install/icon_zhengque.png" alt="" style={{ height: 10, width: 10, marginLeft: 4, marginRight: 9 }} />
</div>
<div style={{ color: '#0F7EFB', fontSize: 11, marginRight: 12 }}>
{row.constructionStatus}
</div>
</div>
) : (
''
)
}
</div>
)
}
},
{
title: '安心云项目名称',
dataIndex: "anxinProject",
@ -148,7 +190,7 @@ const Example = (props) => {
{
row.anxinProject.map((item, index) => {
return (
<div key={index} style={{ whiteSpace: 'nowrap', color: item.projectState == -1 ? '#F93920' : '' }}>
<div key={index} style={{ color: item.projectState == -1 ? '#F93920' : '' }}>
{item.name}<span style={{ color: '#FFFFFF' }}>,</span>
</div>
)
@ -166,48 +208,6 @@ const Example = (props) => {
)
}
},
{
title: 'PEP项企项目名称',
dataIndex: "pepProjectName",
key: 'pepProjectName',
render: (_, row) => {
return (
<div style={{ display: 'flex', alignItems: 'center' }}>
{
row.pepProjectIsDelete == 1 ? (
<Tooltip content={'失效,项目已在【项企PEP】中被删除!'}>
<div style={{ marginRight: 5 }}>
<img src="/assets/images/install/risk.png" alt="" style={{ height: 24, width: 24, }} />
</div>
</Tooltip>) : ('')
}
<Tooltip content={row.pepProjectName || row.name}>
<div style={{ color: row.pepProjectIsDelete == 1 ? 'rgb(249, 57, 32)' : '', width: row?.pepProjectName?.length > 7 || row?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
{row.pepProjectName || row.name}
</div>
</Tooltip>
{
row.pepProjectName ? (
<div style={{
height: 18, marginLeft: 4,
background: 'linear-gradient(180deg, #EBF5FF 0%, #EBF5FF 0%, #D3E8FF 100%)',
borderRadius: 2, display: 'flex', alignItems: 'center'
}}>
<div>
<img src="/assets/images/install/icon_zhengque.png" alt="" style={{ height: 10, width: 10, marginLeft: 4, marginRight: 9 }} />
</div>
<div style={{ color: '#0F7EFB', fontSize: 11, marginRight: 12 }}>
{row.constructionStatus}
</div>
</div>
) : (
''
)
}
</div>
)
}
},
{
title: '关联时间',
dataIndex: "createTime",
@ -329,9 +329,12 @@ const Example = (props) => {
</Button>
</div>
</div>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20, marginTop: 5 }}>
<div style={{ fontSize: 12, color: '#8B8B8B' }}>平台通过映射能力将多个系统的结构化、非结构化、半结构化数据按照平台算法进行分类关联，形成整体项目信息结构，以项企PEP的项目名称进行规范。</div>
</div>
<div style={{ marginTop: 20 }}>
<Skeleton
loading={false}
loading={loading}
active={true}
placeholder={SkeletonScreen()}
>
@ -340,7 +343,6 @@ const Example = (props) => {
dataSource={tableData}
bordered={false}
empty="暂无数据"
style={{ padding: "0px 20px", }}
pagination={false}
onRow={handleRow}
rowSelection={rowSelection}
@ -429,9 +431,9 @@ const Example = (props) => {
}
function mapStateToProps (state) {
const { auth, global, members } = state;
const { auth, global, ProjectPoms } = state;
return {
// loading: members.isRequesting,
loading: ProjectPoms.isRequesting,
user: auth.user,
actions: global.actions,
// members: members.data,

Write Preview
Loading…
Cancel
Save