Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
frontend
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
Schedules
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
h5-communicate
frontend
Commits
fd3b985a
Commit
fd3b985a
authored
Jun 24, 2020
by
熊成伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
bc5d57c3
Pipeline
#15662
passed with stages
in 1 minute and 1 second
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
50 additions
and
37 deletions
+50
-37
WorkCard.jsx
src/components/Card/LogCard/WorkCard.jsx
+3
-3
index.jsx
src/components/Card/LogCard/index.jsx
+12
-5
index.less
src/components/Card/LogCard/index.less
+1
-0
Process.jsx
src/pages/EventProcessing/Process.jsx
+26
-26
WorkDetail.jsx
src/pages/Work/WorkDetail.jsx
+8
-3
No files found.
src/components/Card/LogCard/WorkCard.jsx
View file @
fd3b985a
...
@@ -11,7 +11,7 @@ const Index = (props) => {
...
@@ -11,7 +11,7 @@ const Index = (props) => {
<
div
className=
"todo-tag pos-aline"
>
<
div
className=
"todo-tag pos-aline"
>
{
props
.
name
}
{
props
.
name
}
</
div
>
</
div
>
<
p
>
{
data
.
BT
}
</
p
>
<
p
style=
{
{
flex
:
1
}
}
>
{
data
.
BT
}
</
p
>
</
div
>
</
div
>
<
span
>
<
span
>
<
img
<
img
...
@@ -30,11 +30,11 @@ const Index = (props) => {
...
@@ -30,11 +30,11 @@ const Index = (props) => {
<
p
className=
"pos-aline"
><
img
alt=
""
src=
"/img/time.png"
className=
"footer-mes-img"
/>
更新时间:
{
data
.
JZRQ
}
</
p
>
<
p
className=
"pos-aline"
><
img
alt=
""
src=
"/img/time.png"
className=
"footer-mes-img"
/>
更新时间:
{
data
.
JZRQ
}
</
p
>
<
p
className=
"pos-aline footer-mes-sec"
><
img
alt=
""
src=
"/img/time-2.png"
className=
"footer-mes-img"
/>
发起时间:
{
data
.
SWRQ
}
</
p
>
<
p
className=
"pos-aline footer-mes-sec"
><
img
alt=
""
src=
"/img/time-2.png"
className=
"footer-mes-img"
/>
发起时间:
{
data
.
SWRQ
}
</
p
>
</
div
>
</
div
>
{
props
.
data
&&
props
.
data
.
JJCD
!==
'无'
&&
(
{
props
.
data
&&
props
.
data
.
JJCD
!==
'无'
&&
props
.
data
.
JJCD
===
'紧急'
&&
(
<
img
<
img
alt=
""
alt=
""
className=
"todo-footer-img"
className=
"todo-footer-img"
src=
{
props
.
data
&&
props
.
data
.
JJCD
===
'紧急'
?
'/img/serious.png'
:
'/img/urgency
.png'
}
src=
{
'/img/serious
.png'
}
/>
/>
)
}
)
}
...
...
src/components/Card/LogCard/index.jsx
View file @
fd3b985a
...
@@ -35,11 +35,18 @@ const Index = (props) => {
...
@@ -35,11 +35,18 @@ const Index = (props) => {
<
p
className=
"pos-aline"
><
img
alt=
""
src=
"/img/time.png"
className=
"footer-mes-img"
/>
更新时间:
{
data
.
RECEIVEDATE
?
moment
(
data
.
RECEIVEDATE
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
:
''
}
</
p
>
<
p
className=
"pos-aline"
><
img
alt=
""
src=
"/img/time.png"
className=
"footer-mes-img"
/>
更新时间:
{
data
.
RECEIVEDATE
?
moment
(
data
.
RECEIVEDATE
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
:
''
}
</
p
>
<
p
className=
"pos-aline footer-mes-sec"
><
img
alt=
""
src=
"/img/time-2.png"
className=
"footer-mes-img"
/>
发起时间:
{
data
.
SENDTIME
?
moment
(
data
.
SENDTIME
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
:
''
}
</
p
>
<
p
className=
"pos-aline footer-mes-sec"
><
img
alt=
""
src=
"/img/time-2.png"
className=
"footer-mes-img"
/>
发起时间:
{
data
.
SENDTIME
?
moment
(
data
.
SENDTIME
).
format
(
"YYYY-MM-DD HH:mm:ss"
)
:
''
}
</
p
>
</
div
>
</
div
>
<
img
{
data
&&
data
.
JJCD
!==
'无'
&&
data
.
JJCD
===
'紧急'
&&
(
alt=
""
<
img
className=
"todo-footer-img"
alt=
""
src=
{
props
.
data
&&
props
.
data
.
read
?
'/img/serious.png'
:
'/img/urgency.png'
}
className=
"todo-footer-img"
/>
src=
{
'/img/serious.png'
}
/>
)
}
{
/*<img*/
}
{
/*alt=""*/
}
{
/*className="todo-footer-img"*/
}
{
/*src={props.data && props.data.read ? '/img/serious.png' : '/img/urgency.png'}*/
}
{
/*/>*/
}
</
div
>
</
div
>
</
div
>
</
div
>
);
);
...
...
src/components/Card/LogCard/index.less
View file @
fd3b985a
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
margin-bottom: 1px;
margin-bottom: 1px;
}
}
.todo-tag{
.todo-tag{
text-align: center;
line-height: 18px;
line-height: 18px;
height: 18px;
height: 18px;
font-size: 9px;
font-size: 9px;
...
...
src/pages/EventProcessing/Process.jsx
View file @
fd3b985a
...
@@ -201,33 +201,33 @@ const Process = (props) => {
...
@@ -201,33 +201,33 @@ const Process = (props) => {
}
}
});
});
}
const
handleScroll
=
()
=>
{
const
basic
=
document
.
getElementById
(
"event-basic"
).
offsetTop
;
const
adjunct
=
document
.
getElementById
(
"event-adjunct"
).
offsetTop
;
const
flow
=
document
.
getElementById
(
"event-flow"
).
offsetTop
;
const
option
=
document
.
getElementById
(
"event-option"
).
offsetTop
;
const
top
=
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
;
let
clientHeight
=
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
;
let
scrollHeight
=
document
.
documentElement
.
scrollHeight
||
document
.
body
.
scrollHeight
;
if
(
top
>=
basic
&&
top
<
adjunct
)
{
setCurrent
(
'basic'
)
}
else
if
(
top
>=
adjunct
-
basic
&&
top
<
flow
)
{
setCurrent
(
'adjunct'
)
}
else
if
(
top
>=
flow
-
basic
&&
top
<
option
)
{
setCurrent
(
'flow'
)
}
else
if
(
top
>=
option
-
basic
)
{
setCurrent
(
'option'
)
}
if
(
top
+
clientHeight
===
scrollHeight
)
{
setCurrent
(
'option'
)
}
};
};
useEffect
(()
=>
{
window
.
addEventListener
(
'scroll'
,
handleScroll
,
true
);
// const handleScroll = () => {
return
()
=>
window
.
removeEventListener
(
'scroll'
,
handleScroll
,
true
);
// const basic = document.getElementById("event-basic").offsetTop;
},
[]);
// const adjunct = document.getElementById("event-adjunct").offsetTop;
// const flow = document.getElementById("event-flow").offsetTop;
// const option = document.getElementById("event-option").offsetTop;
// const top = document.documentElement.scrollTop || document.body.scrollTop;
// let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
// let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
// if (top >= basic && top < adjunct) {
// setCurrent('basic')
// }else if (top >= adjunct - basic && top < flow) {
// setCurrent('adjunct')
// }else if (top >= flow - basic && top < option) {
// setCurrent('flow')
// }else if (top >= option - basic) {
// setCurrent('option')
// }
// if (top + clientHeight === scrollHeight) {
// setCurrent('option')
// }
// };
// useEffect(() => {
// window.addEventListener('scroll', handleScroll, true);
// return () => window.removeEventListener('scroll', handleScroll, true);
// }, []);
const
resultLoading
=
basicLoading
&&
adjunctLoading
&&
flowLoading
;
const
resultLoading
=
basicLoading
&&
adjunctLoading
&&
flowLoading
;
return
(
return
(
...
...
src/pages/Work/WorkDetail.jsx
View file @
fd3b985a
...
@@ -87,13 +87,18 @@ const Notice = (props) => {
...
@@ -87,13 +87,18 @@ const Notice = (props) => {
getData
(
false
,
[])
getData
(
false
,
[])
},
[
searchWord
,
tab
]);
},
[
searchWord
,
tab
]);
const
[
tabData
,
setTabData
]
=
useState
([])
const
[
tabData
,
setTabData
]
=
useState
([])
;
useEffect
(()
=>
{
useEffect
(()
=>
{
const
menu
=
JSON
.
parse
(
localStorage
.
getItem
(
"menu"
));
const
menu
=
JSON
.
parse
(
localStorage
.
getItem
(
"menu"
));
const
index
=
menu
.
findIndex
(
item
=>
item
.
id
===
type
);
const
index
=
menu
.
findIndex
(
item
=>
item
.
id
===
type
);
const
menuG
=
menu
[
index
].
children
.
map
(
item
=>
({
title
:
item
.
nodeName
,
sub
:
item
.
id
}))
const
menuG
=
menu
[
index
].
children
.
map
(
item
=>
({
title
:
item
.
nodeName
,
sub
:
item
.
id
}));
if
(
menuG
.
length
>
0
)
{
setTab
(
menuG
[
0
].
sub
)
}
else
{
setStart
(
false
);
setLoading
(
false
)
}
setTabData
(
menuG
);
setTabData
(
menuG
);
setTab
(
menu
[
0
].
id
)
},
[]);
},
[]);
return
(
return
(
<
Document
title=
"通知"
>
<
Document
title=
"通知"
>
...
...
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