Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
5551b755
Commit
5551b755
authored
Oct 21, 2022
by
杨思琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 消息通知修改
parent
a62802ee
Pipeline
#62234
passed with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
40 deletions
+23
-40
NoticeIconView.js
src/components/GlobalHeader/NoticeIconView.js
+23
-40
No files found.
src/components/GlobalHeader/NoticeIconView.js
View file @
5551b755
...
...
@@ -3,81 +3,65 @@ import React, { Component, useMemo, useState } from 'react';
import
{
Button
,
Form
,
Input
,
Modal
,
notification
,
Pagination
}
from
'antd'
;
import
{
connect
}
from
'react-redux'
;
import
{
FormattedMessage
}
from
'@wisdom-utils/components'
;
import
{
history
}
from
'@wisdom-utils/runtime'
;
import
{
findPathByWidget
,
isJSON
}
from
'@wisdom-utils/components/lib/AppLayout/helpers'
;
import
Notifier
from
'../../layouts/AppLayout/notifier/notice'
;
import
NoticeIcon
from
'../../layouts/AppLayout/notifier'
;
import
{
ERR_OK
,
MESSAGE_TYPE
,
NEW_MESSAGE
}
from
'../../layouts/AppLayout/notifier/constants'
;
import
{
findPathByWidget
,
isJSON
}
from
'@wisdom-utils/components/lib/AppLayout/helpers'
;
import
service
from
'../../api/service/notification'
;
import
{
actionCreators
}
from
'../../containers/App/store'
;
import
isProd
from
'../../utils/env'
;
// import NoticeIcon from '../NoticeIcon';
import
styles
from
'./index.less'
;
import
{
history
}
from
'@wisdom-utils/runtime'
;
const
{
TextArea
}
=
Input
;
const
PlatformModal
=
({
platformVisible
,
handleClosePlatform
,
handlerMointer
,
messages
=
[]
})
=>
{
const
[
pageIndex
,
setPageIndex
]
=
useState
(
1
);
const
message
=
useMemo
(()
=>
{
return
messages
[
pageIndex
-
1
];
},
[
messages
,
pageIndex
]);
const
message
=
useMemo
(()
=>
messages
[
pageIndex
-
1
],
[
messages
,
pageIndex
]);
return
(
<
Modal
title
=
{
<
FormattedMessage
id
=
'component.noticeIcon.modal.alarm.title'
/>
}
title
=
{
<
FormattedMessage
id
=
"component.noticeIcon.modal.alarm.title"
/>
}
maskClosable
=
{
false
}
mask
=
{
false
}
maskStyle
=
{{
pointerEvents
:
'none'
}}
maskStyle
=
{{
pointerEvents
:
'none'
}}
visible
=
{
platformVisible
}
zIndex
=
{
5000
}
wrapClassName
=
{
styles
.
platformModalWrap
}
className
=
{
styles
.
platformModal
}
footer
=
{
<
Pagination
simple
total
=
{
messages
.
length
}
pageSize
=
{
1
}
pageIndex
=
{
pageIndex
}
showSizeChanger
=
{
false
}
onChange
=
{(
page
,
pageSize
)
=>
setPageIndex
(
page
)}
/>
}
footer
=
{
<
Pagination
simple
total
=
{
messages
.
length
}
pageSize
=
{
1
}
pageIndex
=
{
pageIndex
}
showSizeChanger
=
{
false
}
onChange
=
{(
page
,
pageSize
)
=>
setPageIndex
(
page
)}
/
>
}
onCancel
=
{()
=>
handleClosePlatform
()}
centered
>
<
div
className
=
{
styles
.
alarmContent
}
>
{
/* eslint-disable-next-line jsx-a11y/alt-text */
}
<
img
src
=
"https://panda-water.com/web4/assets/images/message/报警图标.svg"
alt
=
""
/>
<
img
src
=
"https://panda-water.com/web4/assets/images/message/报警图标.svg"
alt
=
""
/>
<
div
className
=
{
styles
.
content
}
>
<
div
className
=
{
styles
[
'content-top'
]}
>
<
a
onClick
=
{
event
=>
handlerMointer
(
event
,
message
,
true
,)
}
>
<
a
onClick
=
{
event
=>
handlerMointer
(
event
,
message
,
true
)}
>
{
message
&&
message
.
infoContent
&&
message
.
infoContent
.
title
}
<
/a
>
<
span
title
=
{
<
FormattedMessage
id
=
'component.noticeIcon.messsage.statused'
/>
}
onClick
=
{
event
=>
handlerMointer
(
event
,
message
,
false
,)
}
/
>
<
span
title
=
"点击标为已读"
onClick
=
{
event
=>
handlerMointer
(
event
,
message
,
false
)}
/
>
<
/div
>
<
div
className
=
{
styles
[
'content-mid'
]}
>
<
b
>
{
message
&&
message
.
infoContent
&&
message
.
infoContent
.
alarmType
}
<
/b
>
<
b
>
{
message
&&
message
.
infoContent
&&
message
.
infoContent
.
alarmType
}
<
/b
>
{
`|
${
message
&&
message
.
infoContent
&&
message
.
infoContent
.
alarmContent
}
`
}
<
/div
>
<
div
className
=
{
styles
[
'content-bottom'
]}
>
<
p
>
报警值:
<
b
>
{
message
&&
message
.
infoContent
&&
message
.
infoContent
.
alarmValue
}
<
/b
>
<
b
>
{
message
&&
message
.
infoContent
&&
message
.
infoContent
.
alarmValue
}
<
/b
>
{
' / '
}
预设值:
{
message
&&
message
.
infoContent
&&
message
.
infoContent
.
alarmThreshold
}
...
...
@@ -87,9 +71,8 @@ const PlatformModal = ({ platformVisible, handleClosePlatform, handlerMointer, m
<
/div
>
<
/div
>
<
/Modal
>
)
}
);
};
/* eslint-disable */
class
NoticeIconView
extends
Component
{
...
...
@@ -389,7 +372,7 @@ class NoticeIconView extends Component {
/
>
<
/NoticeIcon
>
{
this
.
state
.
platformVisible
&&
(
this
.
state
.
platformVisible
&&
this
.
platformMessages
.
length
>
0
&&
(
<
PlatformModal
platformVisible
=
{
this
.
state
.
platformVisible
}
handleClosePlatform
=
{
this
.
handleClosePlatform
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment