diff --git a/web/client/src/layout/components/sider/index.less b/web/client/src/layout/components/sider/index.less
index 7a4034a..f4b3b9a 100644
--- a/web/client/src/layout/components/sider/index.less
+++ b/web/client/src/layout/components/sider/index.less
@@ -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{
diff --git a/web/client/src/sections/install/actions/system.js b/web/client/src/sections/install/actions/system.js
index a72847b..e1ca7b9 100644
--- a/web/client/src/sections/install/actions/system.js
+++ b/web/client/src/sections/install/actions/system.js
@@ -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) {//绑定安心云、项目管理项目
diff --git a/web/client/src/sections/install/containers/roles.jsx b/web/client/src/sections/install/containers/roles.jsx
index 9ade691..3df529d 100644
--- a/web/client/src/sections/install/containers/roles.jsx
+++ b/web/client/src/sections/install/containers/roles.jsx
@@ -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) => {
管理员设置
ADMINISTRATOR SETTING
+
+
平台最多支持5个管理员权限的关系绑定,该权限可对系统所有功能和项目进行设置和管理,包括系统权限、映射关系、工单配置等敏感操作,请谨慎使用该权限。
+
{
@@ -547,7 +550,7 @@ const Roles = (props) => {
@@ -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,
diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx
index edb904d..64a16a4 100644
--- a/web/client/src/sections/install/containers/system.jsx
+++ b/web/client/src/sections/install/containers/system.jsx
@@ -87,6 +87,48 @@ const Example = (props) => {
return index + 1;
},
},
+ {
+ title: 'PEP项企项目名称',
+ dataIndex: "pepProjectName",
+ key: 'pepProjectName',
+ render: (_, row) => {
+ return (
+
+ {
+ row.pepProjectIsDelete == 1 ? (
+
+
+
+
+ ) : ('')
+ }
+
+ 7 || row?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+ {row.pepProjectName || row.name}
+
+
+ {
+ row.pepProjectName ? (
+
+
+
+
+
+ {row.constructionStatus}
+
+
+ ) : (
+ ''
+ )
+ }
+
+ )
+ }
+ },
{
title: '安心云项目名称',
dataIndex: "anxinProject",
@@ -148,7 +190,7 @@ const Example = (props) => {
{
row.anxinProject.map((item, index) => {
return (
-
+
{item.name},
)
@@ -166,48 +208,6 @@ const Example = (props) => {
)
}
},
- {
- title: 'PEP项企项目名称',
- dataIndex: "pepProjectName",
- key: 'pepProjectName',
- render: (_, row) => {
- return (
-
- {
- row.pepProjectIsDelete == 1 ? (
-
-
-
-
- ) : ('')
- }
-
- 7 || row?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
- {row.pepProjectName || row.name}
-
-
- {
- row.pepProjectName ? (
-
-
-
-
-
- {row.constructionStatus}
-
-
- ) : (
- ''
- )
- }
-
- )
- }
- },
{
title: '关联时间',
dataIndex: "createTime",
@@ -329,9 +329,12 @@ const Example = (props) => {
+
+
平台通过映射能力将多个系统的结构化、非结构化、半结构化数据按照平台算法进行分类关联,形成整体项目信息结构,以项企PEP的项目名称进行规范。
+
@@ -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,