Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

web/client/src/layout/components/header/index.jsx

@@ -30,14 +30,26 @@ const Header = (props) => {
                     }}
                     header={{
                         logo: (
+                            <div style={{display:'flex',alignItems: 'center'}}>
+                                <div>
                                     <img
                                         src="/assets/images/background/logo.png"
-                        style={{ display: "inline-block", width: 280, height: 40 }}
+                                        style={{ display: "inline-block", width: 24, height: 24 }}
                                     />
+                                </div>
+                                <div>
+                                    <div style={{ fontSize: 18, fontFamily: "YouSheBiaoTiHei", color: '#FFFFFF',letterSpacing: 3 }}>运维管理系统</div>
+                                    <div style={{ fontSize: 8, fontFamily: "YouSheBiaoTiHei", color: '#FFFFFF' }}>RUNNING MANAGEMENT SYSTEM</div>
+                                </div>
+                            </div>
+                            //  <img
+                            //     src="/assets/images/background/logo.png"
+                            //     style={{ display: "inline-block", width: 280, height: 40 }}
+                            //  />
                         ),
-                  text: (
-                     <div style={{ fontFamily: "YouSheBiaoTiHei", color: '#FFFFFF' }}>运维管理系统</div>
-                  ),
+                        // text: (
+                        //     <div style={{ fontFamily: "YouSheBiaoTiHei", color: '#FFFFFF' }}>运维管理系统</div>
+                        // ),
                     }}
                     footer={
                         <>

web/client/src/sections/install/components/adminModal.jsx

@@ -7,6 +7,7 @@ import { IconAlertCircle } from '@douyinfe/semi-icons';
 function adminModal (props) {
     const {
         close,
+        cancel,
         visible,
         dispatch,
         pepList,
@@ -60,7 +61,7 @@ function adminModal (props) {
             })
     }
     function handleCancel () {
-        close();
+        cancel();
         //点击弹框取消  左边按钮
     }
     return (

web/client/src/sections/install/components/memberModal.jsx

@@ -7,6 +7,7 @@ import { IconAlertCircle } from '@douyinfe/semi-icons';
 function memberModal (props) {
     const {
         close,
+        cancel,
         visible,
         dispatch,
         pepList,
@@ -82,7 +83,7 @@ function memberModal (props) {
             })
     }
     function handleCancel () {
-        close();
+        cancel();
         //点击弹框取消  左边按钮
     }
     return (

web/client/src/sections/install/components/systemModal.jsx

@@ -7,6 +7,7 @@ import { IconAlertCircle, IconAlertTriangle } from '@douyinfe/semi-icons';
 function adminModal (props) {
     const {
         close,
+        cancel,
         visible,
         dispatch,
         actions,
@@ -67,7 +68,7 @@ function adminModal (props) {
             })
     }
     function handleCancel () {
-        close();
+        cancel();
         //点击弹框取消  左边按钮
     }
     const renderMultipleWithCustomTag = (optionNode, { onClose }) => {

web/client/src/sections/install/containers/roles.jsx

@@ -593,6 +593,9 @@ const Roles = (props) => {
                         pepList={pepList}
                         adminEdit={adminEdit}
                         editObj={editObj}
+                        cancel={() => {
+                            setAdminModal(false);
+                        }}
                         close={() => {
                             setAdminModal(false);
                             getUserList()
@@ -609,6 +612,9 @@ const Roles = (props) => {
                         pomsList={pomsList}
                         anxinDelete={anxinDelete}
                         anxincloudArr={anxincloudArr}
+                        cancel={() => {
+                            setMemberModal(false);
+                        }}
                         close={() => {
                             setMemberModal(false);
                             getUserList()

web/client/src/sections/install/containers/system.jsx

@@ -420,6 +420,9 @@ const Example = (props) => {
                         anxinDelete={anxinDelete}
                         appArr={appArr}
                         bindId={bindId}
+                        cancel={() => {
+                            setSystemModal(false);
+                        }}
                         close={() => {
                             setSystemModal(false);
                             getProjectPomsList()