Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
577e346a
Commit
577e346a
authored
Mar 10, 2021
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:处理更换角色计划列表数据没有变化的问题
parent
5df883eb
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
15 deletions
+15
-15
src/modules/course-manage/components/LiveCourseList.jsx
+2
-0
src/modules/course-manage/video-course/components/VideoCourseList.jsx
+2
-2
src/modules/plan-manage/LearningData.jsx
+1
-1
src/modules/plan-manage/components/PlanList.jsx
+3
-3
src/modules/plan-manage/components/PlanOpt.jsx
+2
-4
src/modules/plan-manage/components/UserLearningData.jsx
+2
-2
src/modules/plan-manage/components/UserLearningDataFilter.jsx
+3
-3
No files found.
src/modules/course-manage/components/LiveCourseList.jsx
View file @
577e346a
...
...
@@ -538,10 +538,12 @@ class LiveCourseList extends React.Component {
renderMoreOperate
=
(
item
)
=>
{
return
(
<
div
className=
"live-course-more-menu"
>
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)
&&
<
div
className=
"operate__item"
onClick=
{
()
=>
this
.
handleRelatedModalShow
(
item
)
}
>
关联培训计划
</
div
>
}
<
div
className=
"operate__item"
onClick=
{
()
=>
this
.
toEditCoursePage
(
item
)
}
...
...
src/modules/course-manage/video-course/components/VideoCourseList.jsx
View file @
577e346a
...
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-05 10:12:45
* @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-
08 15:07:16
* @LastEditTime: 2021-03-
10 15:53:11
* @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -221,7 +221,7 @@ class VideoCourseList extends React.Component {
renderMoreOperate
=
(
item
)
=>
{
return
(
<
div
className=
"live-course-more-menu"
>
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)
&&
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)
&&
<
div
className=
"operate__item"
onClick=
{
()
=>
this
.
handleRelatedModalShow
(
item
)
}
...
...
src/modules/plan-manage/LearningData.jsx
View file @
577e346a
...
...
@@ -92,7 +92,7 @@ class LearningData extends React.Component {
</
div
>
</
div
>
<
div
className=
"box"
>
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)?
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)?
(<
Tabs
activeKey=
{
activeKey
}
onChange=
{
(
activeKey
)
=>
{
this
.
setState
({
activeKey
})}
}
>
<
Tabs
.
TabPane
tab=
"员工分享数据"
key=
"employeeShareData"
>
<
EmployeeShareData
/>
...
...
src/modules/plan-manage/components/PlanList.jsx
View file @
577e346a
...
...
@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2021-02-20 16:46:46
* @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-10 1
1:20:42
* @LastEditTime: 2021-03-10 1
5:51:26
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -56,7 +56,7 @@ function PlanList(props) {
dataIndex
:
"status"
,
render
:
(
val
,
item
,
index
)
=>
{
return
(
<
Switch
checked=
{
item
.
enableState
===
"NO"
?
false
:
true
}
onChange=
{
()
=>
changeEnableState
(
item
)
}
disabled=
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)?
false
:
true
}
/>
<
Switch
checked=
{
item
.
enableState
===
"NO"
?
false
:
true
}
onChange=
{
()
=>
changeEnableState
(
item
)
}
disabled=
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)?
false
:
true
}
/>
)
},
},
...
...
@@ -122,7 +122,7 @@ function PlanList(props) {
<
div
className=
"operate__item"
onClick=
{
()
=>
{
handleShowShareModal
(
record
);
}
}
>
分享
</
div
>
</>
}
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)
&&
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)
&&
<>
<
span
className=
"operate__item split"
>
|
</
span
>
<
Dropdown
overlay=
{
renderMoreOperate
(
record
)
}
>
...
...
src/modules/plan-manage/components/PlanOpt.jsx
View file @
577e346a
...
...
@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2021-02-20 16:45:51
* @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-
01 16:43:16
* @LastEditTime: 2021-03-
10 15:50:02
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -11,8 +11,6 @@ import { Button } from 'antd';
import
{
withRouter
}
from
'react-router-dom'
;
import
User
from
'@/common/js/user'
;
import
'./PlanOpt.less'
;
const
userRole
=
User
.
getUserRole
();
function
PlanOpt
()
{
function
handleCreatePlan
(){
window
.
RCHistory
.
push
({
...
...
@@ -21,7 +19,7 @@ function PlanOpt() {
}
return
(
<
div
className=
"plan-opt"
>
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)
&&
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)
&&
<
Button
type=
"primary"
className=
"mr12"
...
...
src/modules/plan-manage/components/UserLearningData.jsx
View file @
577e346a
...
...
@@ -108,7 +108,7 @@ class UserLearningData extends React.Component {
})
}
UnbundEmployee
=
(
record
)
=>
{
if
(
userRole
===
'CloudOperator'
){
if
(
User
.
getUserRole
()
===
'CloudOperator'
){
return
confirm
({
title
:
"你确定要解绑与用户的关系吗?"
,
content
:
"解绑后,用户该培训计划的学习数据将同步移出"
,
...
...
@@ -153,7 +153,7 @@ class UserLearningData extends React.Component {
// 请求表头
parselumns
=
()
=>
{
let
columns
;
if
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
){
if
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
){
columns
=
[
{
title
:
'用户'
,
...
...
src/modules/plan-manage/components/UserLearningDataFilter.jsx
View file @
577e346a
...
...
@@ -128,7 +128,7 @@ function UserLearningDataFilter(props) {
enterButton=
{
<
span
className=
"icon iconfont"
>

</
span
>
}
/>
</
div
>
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)
&&
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)
&&
<
div
className=
"search-condition__item"
>
<
span
className=
"label lead-label"
>
负责人:
</
span
>
<
Select
...
...
@@ -179,7 +179,7 @@ function UserLearningDataFilter(props) {
style=
{
{
width
:
"calc(100% - 98px)"
}
}
/>
</
div
>
{
((
expandFilter
&&
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
))
||
u
serRole
===
"CloudOperator"
)
&&
{
((
expandFilter
&&
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
))
||
User
.
getU
serRole
===
"CloudOperator"
)
&&
<
div
className=
"search-condition__item"
>
<
span
className=
"label learn-status-label"
>
学习状态:
</
span
>
<
Select
...
...
@@ -195,7 +195,7 @@ function UserLearningDataFilter(props) {
</
div
>
}
</
div
>
{
(
userRole
===
"CloudManager"
||
userRole
===
"StoreManager"
)
&&
{
(
User
.
getUserRole
()
===
"CloudManager"
||
User
.
getUserRole
()
===
"StoreManager"
)
&&
<
div
className=
"reset-fold-area"
>
<
Tooltip
title=
"清空筛选"
><
span
className=
"resetBtn iconfont icon"
onClick=
{
handleReset
}
>

</
span
></
Tooltip
>
<
span
style=
{
{
cursor
:
'pointer'
}
}
className=
"fold-btn"
onClick=
{
()
=>
{
...
...
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