diff --git a/web/client/assets/images/install/risk.png b/web/client/assets/images/install/risk.png new file mode 100644 index 0000000..2ce4650 Binary files /dev/null and b/web/client/assets/images/install/risk.png differ diff --git a/web/client/src/sections/install/components/systemModal.jsx b/web/client/src/sections/install/components/systemModal.jsx index 8a38063..0c71c8b 100644 --- a/web/client/src/sections/install/components/systemModal.jsx +++ b/web/client/src/sections/install/components/systemModal.jsx @@ -31,7 +31,6 @@ function adminModal (props) { setCustom(true) setMyprojectType('axy') } - console.log('appArr',appArr); // if (editObj.id) { // let departmentList = [] // for (let i = 0; i < pepList.length; i++) { @@ -58,7 +57,7 @@ function adminModal (props) { } let bindObj = JSON.parse(JSON.stringify(values)) bindObj.appId = appArr - dispatch(install.postProjectBind({ ...bindObj,bindId:bindId, msg: '修改映射关系' })).then((res) => {//获取项企(PEP)全部部门及其下用户 + dispatch(install.postProjectBind({ ...bindObj, bindId: bindId, msg: '修改映射关系' })).then((res) => {//获取项企(PEP)全部部门及其下用户 if (res.success) { close(); } @@ -108,8 +107,8 @@ function adminModal (props) { onCancel={handleCancel} >
-
-
+
+
映射关系由项企立项项目与安心云项目关联产生,若项目未在项企中有记载,可选自定义项目,待项企立项项后再进行修改!
(form.current = formApi)} >
- + 项企项目 自定义项目(未在项企中立项的项目可选) @@ -143,7 +143,7 @@ function adminModal (props) { field="name" label='自定义项目:' style={{ width: 425 }} - maxLength={18} + maxLength={15} initValue={pepname || ""} placeholder="请输入项目名称,且名称需与项企区分" showClear @@ -159,7 +159,7 @@ function adminModal (props) { style={{ width: 425 }} rules={[{ required: true, message: "请选择PEP项企项目" }]} initValue={pepProjectId || ""} - disabled={systemEdit&&!pepname} + disabled={systemEdit && !pepname} showClear > { @@ -200,13 +200,13 @@ function adminModal (props) { { anxinDelete.length > 0 ? (
-
- +
+
确认关联后“{anxinDelete.join('、')}”将被系统移除映射关系,原因是项目已在【安心云】中被删除!
diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx index e6ab499..be6d5f4 100644 --- a/web/client/src/sections/install/containers/system.jsx +++ b/web/client/src/sections/install/containers/system.jsx @@ -1,7 +1,6 @@ import React, { useEffect, useRef, useState } from 'react'; import { connect } from 'react-redux'; import { Skeleton, Button, Pagination, Table, Popconfirm, Tooltip } from '@douyinfe/semi-ui'; -import { IconAlertTriangle } from "@douyinfe/semi-icons"; import { SkeletonScreen, } from "$components"; import moment from "moment"; import SystemModal from '../components/systemModal' @@ -106,9 +105,9 @@ const Example = (props) => {
{ anxinerror ? ( - +
- +
) : ('') } @@ -176,9 +175,9 @@ const Example = (props) => {
{ row.pepProjectIsDelete == 1 ? ( - +
- +
) : ('') } @@ -214,7 +213,7 @@ const Example = (props) => { dataIndex: "createTime", key: 'time', render: (_, row) => { - return moment(row.createTime).format("YYYY-MM-DD HH:MM:SS"); + return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"); } }, { @@ -355,34 +354,35 @@ const Example = (props) => { }} >
-
勾选{selected.length}条问题
+
勾选 {selected.length}条 信息
+ }} style={{ fontSize: 13, width: 93, height: 24, borderRadius: '1px', background: '#FFFFFF', border: '1px solid #0F7EFB', color: '#0F7EFB', fontWeight: 400, margin: '0 10px' }}> + {mylimits.current == selected.length ? '取消全选' : '全选'} + { - dispatch(install.deleteProjectBind({ bindId: selected.join(','), msg: '删除安心云、项目管理项目绑定关系' })).then(() => { - if (page.current > 0 && mylimits.current == selected.length) { - setQuery({ limit: 10, page: page.current - 1 }) - } else { - setQuery({ limit: 10, page: page.current }) - } - setSelected([]) - }) - }} - > - - - + title="删除后对应的项目全局将无法进入和显示,对应的信鸽服务也会被禁用" + arrowPointAtCenter={false} + showArrow={true} + position="topRight" + onConfirm={() => { + dispatch(install.deleteProjectBind({ bindId: selected.join(','), msg: '删除安心云、项目管理项目绑定关系' })).then(() => { + if (page.current > 0 && mylimits.current == selected.length) { + setQuery({ limit: 10, page: page.current - 1 }) + } else { + setQuery({ limit: 10, page: page.current }) + } + setSelected([]) + }) + }} + > + +
@@ -397,6 +397,7 @@ const Example = (props) => { onChange={(currentPage, pageSize) => { setQuery({ limit: pageSize, page: currentPage - 1 }); page.current = currentPage - 1 + setSelected([]) }} />
diff --git a/web/client/src/sections/install/style.less b/web/client/src/sections/install/style.less index 81ee0b7..aa91f88 100644 --- a/web/client/src/sections/install/style.less +++ b/web/client/src/sections/install/style.less @@ -4,7 +4,6 @@ font-size: 13px; } } -.roleBottom{ .semi-table{ .semi-table-row:first-child{ .semi-table-row-head{ @@ -13,7 +12,6 @@ } } } -} .adminTop{ box-shadow: 0px 0px 12px 2px rgba(220,222,224,0.2); transition: box-shadow 0.5s ease;