-
+ {row?.disable ? (
+
+ ) : (
+ {
+ dispatch(service.putPushPushId({ pushId: row?.id, del: false, disable: true, msg: '更改推送配置状态' })).then(() => {
+ // setQuery({ limit: 10, page: page.current })
+ })
+ }}
+ >
+
+
+ )}
{
- // dispatch(install.deleteProjectBind({ bindId: row?.id, msg: '删除安心云、项目管理项目绑定关系' })).then(() => {
- // if (page.current > 0 && mylimits.current < 2) {
- // setQuery({ limit: 10, page: page.current - 1 })
- // } else {
- // setQuery({ limit: 10, page: page.current })
- // }
- // })
+ dispatch(service.putPushPushId({ pushId: row?.id, del: true, disable: false, msg: '删除推送配置' })).then(() => {
+ // if (page.current > 0 && mylimits.current < 2) {
+ // setQuery({ limit: 10, page: page.current - 1 })
+ // } else {
+ // setQuery({ limit: 10, page: page.current })
+ // }
+ })
}}
>
@@ -196,30 +222,29 @@ const EmPush = (props) => {
);
},
},
- ])
+ ]
+ function expandRowRender (record, index) {
+ return (
+
}
+ {
+ row.pomsProject?.pepProject?.projectName ? (
+
+ 结构物：
+ {
+ record.structure?.map((item, index) => {
+ return (
+
+ )
+ }
//获取表格属性设置
- function attribute () {
+ function attribute (val) {
const arr = localStorage.getItem(EMPUSH)
? JSON.parse(localStorage.getItem(EMPUSH))
: [];
-
const column = [
- {
- title: '策略名称',
- dataIndex: "name",
- key: 'name',
- render: (_, row) => {
- return row.name
- }
- },
- {
- title: "创建时间",
- dataIndex: "createTime",
- key: "createTime",
- render: (_, r, index) => {
- return moment(r.createTime).format('YYYY-MM-DD HH:mm:ss');
- },
- },
{
title: '关联项目',
dataIndex: "projectName",
@@ -250,10 +275,63 @@ const EmPush = (props) => {
+ {item.name}
+
+ )
+ })
+ }
+
+
+ ) : (
+
+ 
+
+
+
+ {
+ val.map((ite, idx) => {
+ return (
+
+
+ {ite.id == row.pomsProject?.pepProject.constructionStatusId ? ite.construction_status : ''}
+
+ )
+ })
+ }
+
+
+ )
+ }
)
}
},
+ {
+ title: '策略名称',
+ dataIndex: "name",
+ key: 'name',
+ render: (_, row) => {
+ return row.name
+ }
+ },
+ {
+ title: "创建时间",
+ dataIndex: "createTime",
+ key: "createTime",
+ render: (_, r, index) => {
+ return moment(r.createTime).format('YYYY-MM-DD HH:mm:ss');
+ },
+ },
{
title: '接收人',
dataIndex: "receiverPepUser",
@@ -280,7 +358,7 @@ const EmPush = (props) => {
{
row.receiverPepUser.map((item, index) => {
return (
-
+ 
+
+
+
+ POMS
+
+
+
{item.name},
)
@@ -314,7 +392,6 @@ const EmPush = (props) => {
return (
{
- // alarmTypeObj
row.alarmType.map((item, index) => {
return (
-
@@ -355,9 +432,81 @@ const EmPush = (props) => {
title: "生效项目节点",
dataIndex: "timeType",
key: "timeType",
- render: (_, r, index) => {
- // projectStatus
- return r.timeType[0]
+ render: (_, row, index) => {
+ return (
+
+ )
},
},
{
@@ -372,9 +521,31 @@ const EmPush = (props) => {
title: "启用状态",
dataIndex: "disable",
key: "disable",
- render: (_, r, index) => {
- // projectStatus
- return r.disable
+ render: (_, row, index) => {
+ let enableType = ''
+ if (row.disable) {
+ enableType = '禁用'
+ }
+ else {
+ if (row.timeType.length > 0) {
+ for (let i = 0; i < row.timeType.length; i++) {
+ if (row.timeType[i] == row.pomsProject?.pepProject?.constructionStatusId) {
+ enableType = '已生效'
+ break;
+ } else {
+ enableType = '未生效'
+ }
+ }
+ }
+ else {
+ enableType = '已生效'
+ }
+ }
+ return (
+
+ {
+ row.timeType.length > 0 ? (
+ row.timeType.map((item, index) => {
+ return (
+
+ {
+ row.timeType.map((item, index) => {
+ return (
+
+ } trigger="click" style={{ lineHeight: 2 }}>
+ 1 ? 'none' : 'flex', alignItems: 'center'
+ }}>
+
+ )
+ })
+ ) : (
+
+
+
+
+
+ {
+ val.map((ite, idx) => {
+ return (
+
+
+ {ite.id == item ? ite.construction_status : ''}
+
+ )
+ })
+ }
+
+
+ )
+ }
+ {
+ row.timeType.length > 2 ? (
+
+
+
+
+
+ POMS
+
+
+ {
+ val.map((ite, idx) => {
+ return (
+
+ {ite.id == item ? ite.construction_status : ''}
+
+ )
+ })
+ },
+
+ )
+ })
+ }
+
+ +{row.timeType.length - 2}
+
+
+ ) : ('')
+ }
+
+ {enableType}
+
+ )
},
},
{
@@ -382,7 +553,7 @@ const EmPush = (props) => {
dataIndex: "pushCount",
key: "pushCount",
render: (_, r, index) => {
- return r.pushCount
+ return r.pushCount + '次'
},
},
];
@@ -403,7 +574,7 @@ const EmPush = (props) => {
EM推送
Em push
+
@@ -502,10 +681,13 @@ const EmPush = (props) => {
placeholder={SkeletonScreen()}
>
s)}
dataSource={tableData}
bordered={false}
+ hideExpandedColumn={false}
empty="暂无数据"
+ expandedRowRender={expandRowRender}
pagination={false}
onRow={handleRow}
/>
@@ -543,6 +725,7 @@ const EmPush = (props) => {