From b09f9cee271fe8d086c38777d11699c07c509279 Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Thu, 22 Sep 2022 10:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=AF=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/sider/index.less    |  6 ++
 .../src/sections/install/actions/system.js    |  6 +-
 .../src/sections/install/containers/roles.jsx | 11 ++-
 .../sections/install/containers/system.jsx    | 96 ++++++++++---------
 4 files changed, 65 insertions(+), 54 deletions(-)

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) => {
                     <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,
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 (
+                    <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,