Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
biz.qingxiao.com
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
wangxuelai
biz.qingxiao.com
Commits
177906e7
Commit
177906e7
authored
Sep 07, 2019
by
wangxuelai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
''
parent
ad7b1f2c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
43 deletions
+9
-43
classdetail.js
src/models/classdetail.js
+1
-1
webapp.js
src/models/webapp.js
+2
-36
index.js
src/pages/classdetail/index.js
+2
-2
ClassStatusChangeModal.js
src/pages/classmgt/ClassStatusChangeModal.js
+1
-1
index.js
src/pages/classmgt/index.js
+1
-1
StudentAdd.js
src/pages/student/StudentAdd.js
+1
-1
StudentEdit.js
src/pages/studentinfo/StudentEdit.js
+1
-1
No files found.
src/models/classdetail.js
View file @
177906e7
...
...
@@ -1151,7 +1151,7 @@ export default {
});
if
(
classDetailData
.
code
==
200
)
{
classDetail
=
classDetailData
.
data
;
classDetail
.
teacher_id
=
classDetailData
.
data
.
school_teachers
.
map
(
ele
=>
ele
.
id
)
||
[];
classDetail
.
teacher_id
=
(
classDetailData
.
data
.
school_teachers
&&
classDetailData
.
data
.
school_teachers
.
map
(
ele
=>
ele
.
id
)
)
||
[];
yield
put
({
type
:
'updateState'
,
payload
:
{
...
...
src/models/webapp.js
View file @
177906e7
...
...
@@ -654,42 +654,8 @@ export default {
type
:
'updateState'
,
});
},
*
judgeexpire
({
payload
},
{
put
,
call
,
select
})
{
// const webapp = yield select(state => state.webapp);
// const { userInfo } = webapp;
// const { isLogin, isSchoolAdd } = payload;
// if ((LocalStorage.getItem('user') && LocalStorage.getItem('user').token && LocalStorage.getItem('dakarole') == 1) || (LocalStorage.getItem('teacher') && LocalStorage.getItem('teacher').token && LocalStorage.getItem('dakarole') == 2)) {
// const memberSchools = yield call(users.memberSchools);
// if (memberSchools.data.list.length > 0) {
// LocalStorage.setItem('sid', memberSchools.data.list[0].id);
// yield put({
// type: 'webapp/updateState',
// payload: {
// sid: memberSchools.data.list[0].id,
// },
// });
// yield put(routerRedux.push({
// pathname: '/sjd/indexstaic',
// }));
// } else {
// if (isSchoolAdd) {
// return;
// }
// yield put(routerRedux.push({
// pathname: '/schooladd',
// }));
// }
// } else {
// LocalStorage.removeItem('user');
// LocalStorage.removeItem('dakarole');
// LocalStorage.removeItem('teacher');
// if (isSchoolAdd) {
// yield put(routerRedux.push({
// pathname: '/login',
// }));
// }
// }
},
// * judgeexpire({ payload }, { put, call, select }) {
// },
*
shiftSchool
({
payload
},
{
put
,
select
})
{
yield
put
(
routerRedux
.
replace
({
pathname
:
'/schoollist'
,
...
...
src/pages/classdetail/index.js
View file @
177906e7
...
...
@@ -958,7 +958,7 @@ class ClassDetailForm extends React.Component {
{
record
.
rule
.
type
==
1
&&
<
div
>
<
div
>
{
record
.
rule
.
start_date
}
开始
<
/div
>
<
div
>
({
record
.
rule
.
week_day
.
map
(
ele
=>
(
<
div
>
({
record
.
rule
.
week_day
&&
record
.
rule
.
week_day
.
map
(
ele
=>
(
`
${
record
.
rule
.
is_repeat
==
1
?
'每周'
:
'隔周'
}${[
'一'
,
'二'
,
'三'
,
'四'
,
'五'
,
'六'
,
'日'
][
ele
-
1
]}
`
)).
join
(
'/'
)})
<
/div
>
...
...
@@ -1418,7 +1418,7 @@ class ClassDetailForm extends React.Component {
<
Col
xs
=
{{
span
:
24
}}
sm
=
{{
span
:
12
}}
md
=
{{
span
:
12
}}
lg
=
{{
span
:
6
}}
>
<
span
className
=
{
pageStyle
.
detailtitle
}
>
班级老师:
<
/span
>
{
classDetail
.
school_teachers
&&
classDetail
.
school_teachers
.
length
>
0
&&
<
span
className
=
{
pageStyle
.
detaildesc
}
>
{
classDetail
.
school_teachers
.
map
(
ele
=>
ele
.
nickname
).
join
(
','
)}
<
/span
>
<
span
className
=
{
pageStyle
.
detaildesc
}
>
{
classDetail
.
school_teachers
&&
classDetail
.
school_teachers
.
map
(
ele
=>
ele
.
nickname
).
join
(
','
)}
<
/span
>
}
{(
!
classDetail
.
school_teachers
||
classDetail
.
school_teachers
.
length
==
0
)
&&
<
span
className
=
{
pageStyle
.
detaildesc
}
>
未绑定
<
/span
>
...
...
src/pages/classmgt/ClassStatusChangeModal.js
View file @
177906e7
...
...
@@ -75,7 +75,7 @@ class ClassStatusChangeModal extends React.Component {
render
:
(
text
,
record
,
index
)
=>
{
return
(
<
div
>
{
record
.
school_teachers
.
map
(
ele
=>
ele
.
nickname
).
join
(
','
)
}
{
record
.
school_teachers
&&
record
.
school_teachers
.
map
(
ele
=>
ele
.
nickname
).
join
(
','
)
}
<
/div
>
);
},
...
...
src/pages/classmgt/index.js
View file @
177906e7
...
...
@@ -415,7 +415,7 @@ class ClassMgtForm extends React.Component {
render
:
(
text
,
record
,
index
)
=>
{
return
(
<
div
>
{
record
.
school_teachers
.
map
(
ele
=>
ele
.
nickname
).
join
(
','
)
}
{
record
.
school_teachers
&&
record
.
school_teachers
.
map
(
ele
=>
ele
.
nickname
).
join
(
','
)
}
<
/div
>
);
},
...
...
src/pages/student/StudentAdd.js
View file @
177906e7
...
...
@@ -220,7 +220,7 @@ class StudentAddForm extends React.Component {
<
/Col
>
<
Col
sm
=
{{
span
:
8
}}
style
=
{{
textAlign
:
'center'
}}
>
<
img
className
=
{
pageStyle
.
avatar
}
src
=
{
imagify
(
studentAvator
)
||
`
${
__IMGCDN__
}
defaultavatar.png`
}
alt
=
"1"
/>
<
span
style
=
{{
position
:
'relative'
}}
>
<
span
style
=
{{
position
:
'relative'
,
color
:
'#1890FF'
}}
>
<
input
type
=
"file"
id
=
"uploadinput"
className
=
{
pageStyle
.
fileuploadinput
}
onChange
=
{(
e
)
=>
{
this
.
uploadAvator
(
e
);
}}
accept
=
"image/*"
/>
上传头像
<
/span
>
...
...
src/pages/studentinfo/StudentEdit.js
View file @
177906e7
...
...
@@ -178,7 +178,7 @@ class StudentAddForm extends React.Component {
<
/Col
>
<
Col
sm
=
{{
span
:
8
}}
style
=
{{
textAlign
:
'center'
}}
>
<
img
className
=
{
pageStyle
.
avatar
}
src
=
{
imagify
(
studentAvator
)
||
`
${
__IMGCDN__
}
defaultavatar.png`
}
alt
=
""
/>
<
span
style
=
{{
position
:
'relative'
}}
>
<
span
style
=
{{
position
:
'relative'
,
color
:
'#1890FF'
}}
>
<
input
type
=
"file"
id
=
"uploadinput"
className
=
{
pageStyle
.
fileuploadinput
}
onChange
=
{(
e
)
=>
{
this
.
uploadAvator
(
e
);
}}
accept
=
"image/*"
/>
上传头像
<
/span
>
...
...
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