Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
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
罗超
confucius
Commits
f97efb7c
Commit
f97efb7c
authored
Jul 07, 2021
by
罗超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/confucius
into master
parents
f7f93691
51aea3d8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
734 additions
and
390 deletions
+734
-390
class.js
src/api/course/class.js
+2
-2
class-form.vue
src/components/course/class-form.vue
+33
-7
user-right-box.vue
src/components/global/user-right-box.vue
+3
-3
summaryInfo.vue
src/components/user/summaryInfo.vue
+79
-2
lessonPreparation.vue
src/pages/course/lessonPreparation.vue
+23
-11
prepareclassDetails.vue
src/pages/course/prepareclassDetails.vue
+372
-249
teacherLesson.vue
src/pages/course/teacherLesson.vue
+212
-108
personalData.vue
src/pages/user/personalData.vue
+7
-8
user.js
src/store/modules/user.js
+3
-0
No files found.
src/api/course/class.js
View file @
f97efb7c
...
@@ -151,7 +151,7 @@ export function queryClassLogPageList(data) {
...
@@ -151,7 +151,7 @@ export function queryClassLogPageList(data) {
*/
*/
export
function
GetTeacherPlan
(
data
)
{
export
function
GetTeacherPlan
(
data
)
{
return
request
({
return
request
({
url
:
"/Class/GetTeacherPlan"
,
url
:
"/Class/Get
New
TeacherPlan"
,
method
:
'post'
,
method
:
'post'
,
data
data
})
})
...
@@ -191,7 +191,7 @@ export function setLessonComment(data) {
...
@@ -191,7 +191,7 @@ export function setLessonComment(data) {
*/
*/
export
function
updateClassLessPlan
(
data
)
{
export
function
updateClassLessPlan
(
data
)
{
return
request
({
return
request
({
url
:
"/Class/
UpdateClassLessPlan
"
,
url
:
"/Class/
GetUpdateClassLessPlanSummary
"
,
method
:
'post'
,
method
:
'post'
,
data
data
})
})
...
...
src/components/course/class-form.vue
View file @
f97efb7c
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
</q-field>
</q-field>
</div>
</div>
</div>
</div>
<div
class=
"EmpLine_title"
style=
"margin
:10px 0;
"
>
<div
class=
"EmpLine_title"
style=
"margin
-top:20px
"
>
<div
class=
"Emp_Line"
></div>
<div
class=
"Emp_Line"
></div>
<div>
上课设置
</div>
<div>
上课设置
</div>
</div>
</div>
...
@@ -287,12 +287,38 @@
...
@@ -287,12 +287,38 @@
<a
@
click=
"deletePlan(nIndex)"
style=
"color:blue;cursor:pointer;position:absolute;"
>
删除
</a>
<a
@
click=
"deletePlan(nIndex)"
style=
"color:blue;cursor:pointer;position:absolute;"
>
删除
</a>
</td>
</td>
<td>
<td>
<q-input
filled
stack-label
maxlength=
"20"
v-model=
"sItem.StartTime"
placeholder=
"08:30"
<q-input
filled
v-model=
"sItem.StartTime"
class=
"col-6 q-pl-lg"
placeholder=
"开始时间"
mask=
"time"
>
:dense=
"false"
class=
"col-6 q-pr-lg"
label=
"开始时间"
/>
<template
v-slot:append
>
<q-icon
name=
"access_time"
class=
"cursor-pointer"
>
<q-popup-proxy
transition-show=
"scale"
transition-hide=
"scale"
>
<q-time
v-model=
"sItem.StartTime"
>
<div
class=
"row items-center justify-end"
>
<q-btn
v-close-popup
label=
"确定"
color=
"primary"
flat
/>
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</
template
>
</q-input>
<!-- <q-input filled stack-label maxlength="20" v-model="sItem.StartTime" placeholder="08:30"
:dense="false" class="col-6 q-pr-lg" label="开始时间" /> -->
</td>
</td>
<td>
<td>
<q-input
filled
stack-label
maxlength=
"20"
v-model=
"sItem.EndTime"
placeholder=
"09:30"
:dense=
"false"
<q-input
filled
v-model=
"sItem.EndTime"
class=
"col-6 q-pr-lg"
placeholder=
"结束时间"
mask=
"time"
>
class=
"col-6 q-pr-lg"
label=
"结束时间"
/>
<
template
v-slot:append
>
<q-icon
name=
"access_time"
class=
"cursor-pointer"
>
<q-popup-proxy
transition-show=
"scale"
transition-hide=
"scale"
>
<q-time
v-model=
"sItem.EndTime"
>
<div
class=
"row items-center justify-end"
>
<q-btn
v-close-popup
label=
"确定"
color=
"primary"
flat
/>
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</
template
>
</q-input>
<!-- <q-input filled stack-label maxlength="20" v-model="sItem.EndTime" placeholder="09:30" :dense="false"
class="col-6 q-pr-lg" label="结束时间" /> -->
</td>
</td>
<td>
<td>
<q-input
filled
stack-label
maxlength=
"20"
v-model=
"sItem.TimeHour"
<q-input
filled
stack-label
maxlength=
"20"
v-model=
"sItem.TimeHour"
...
@@ -321,9 +347,9 @@
...
@@ -321,9 +347,9 @@
</q-select>
</q-select>
</div>
</div>
</div>
</div>
<div
class=
"row wrap"
style=
"margin-top:30px;"
>
<div
class=
"row wrap"
>
<div
class=
"col-12"
>
<div
class=
"col-12"
>
<q-input
filled
stack-label
maxlength=
"2000"
v-model=
"objOption.InnerRemark"
:dense=
"false"
<q-input
filled
type=
"textarea"
:rows=
"3"
stack-label
maxlength=
"2000"
v-model=
"objOption.InnerRemark"
:dense=
"false"
class=
"col-12 q-pr-lg q-pb-lg"
label=
"对内备注"
/>
class=
"col-12 q-pr-lg q-pb-lg"
label=
"对内备注"
/>
</div>
</div>
</div>
</div>
...
...
src/components/global/user-right-box.vue
View file @
f97efb7c
...
@@ -144,9 +144,9 @@ export default {
...
@@ -144,9 +144,9 @@ export default {
this
.
$emit
(
'close'
)
this
.
$emit
(
'close'
)
},
},
goUrlgeren
(){
//个人资料
goUrlgeren
(){
//个人资料
//
this.$router.push({
this
.
$router
.
push
({
//
path: '/user/personalData',
path
:
'/user/personalData'
,
//
})
})
},
},
undefinedGongneng
()
{
undefinedGongneng
()
{
this
.
$q
.
dialog
({
this
.
$q
.
dialog
({
...
...
src/components/user/summaryInfo.vue
View file @
f97efb7c
...
@@ -54,6 +54,50 @@
...
@@ -54,6 +54,50 @@
border-radius
:
6px
;
border-radius
:
6px
;
padding
:
20px
;
padding
:
20px
;
}
}
.summaryInfo
.textbox
{
width
:
100%
;
height
:
130px
;
border-radius
:
20px
;
font-size
:
16px
;
padding-left
:
29px
;
padding-top
:
29px
;
}
.summaryInfo
.lanstyle
{
color
:
#3699FF
;
background
:
#ECF6FF
;
}
.summaryInfo
.redstyle
{
color
:
#F44E60
;
background
:
#FFEEF0
;
}
.summaryInfo
.justyle
{
color
:
#FFA800
;
background
:
#FFF8EB
;
}
.summaryInfo
.lvstyle
{
color
:
#1BC5C2
;
background
:
#EEFEFD
;
}
.summaryInfo
.scrollbox
::-webkit-scrollbar
{
width
:
3px
;
height
:
3px
;
background-color
:
#F5F5F5
;
}
/*!*定义滚动条轨道 内阴影+圆角*!*/
.summaryInfo
.scrollbox
::-webkit-scrollbar-track
{
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
0.3
);
border-radius
:
10px
;
background-color
:
#F5F5F5
;
}
/*!*定义滑块 内阴影+圆角*!*/
.summaryInfo
.scrollbox
::-webkit-scrollbar-thumb
{
border-radius
:
10px
;
-webkit-box-shadow
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
color-stop
(
.5
,
rgba
(
255
,
255
,
255
,
.2
)),
color-stop
(
.5
,
transparent
),
to
(
transparent
));
background-color
:
#0ae
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"summaryInfo"
>
<div
class=
"summaryInfo"
>
...
@@ -68,7 +112,7 @@
...
@@ -68,7 +112,7 @@
<span
class=
"box_t_itext"
>
公告
</span>
<span
class=
"box_t_itext"
>
公告
</span>
</div>
</div>
</div>
</div>
<div
<div
class=
"scrollbox"
style=
"margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"
>
style=
"margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"
>
<div
v-for=
"(item,index) in noticeList"
:key=
'index'
class=
"noticeitem"
<div
v-for=
"(item,index) in noticeList"
:key=
'index'
class=
"noticeitem"
@
click=
"goNoticeDetail(item)"
>
@
click=
"goNoticeDetail(item)"
>
...
@@ -107,7 +151,7 @@
...
@@ -107,7 +151,7 @@
<span
class=
"box_t_itext"
>
消息
</span>
<span
class=
"box_t_itext"
>
消息
</span>
</div>
</div>
</div>
</div>
<div
<div
class=
"scrollbox"
style=
"margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"
>
style=
"margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"
>
<q-list
v-if=
"socektArr.length>0"
>
<q-list
v-if=
"socektArr.length>0"
>
<q-item
class=
"q-my-sm q-pa-xs items-start"
v-for=
"(x,i) in socektArr"
:key=
"i"
<q-item
class=
"q-my-sm q-pa-xs items-start"
v-for=
"(x,i) in socektArr"
:key=
"i"
...
@@ -146,6 +190,39 @@
...
@@ -146,6 +190,39 @@
</div>
</div>
</div>
</div>
<div
id=
"main"
style=
"width: 100%;height:300px;"
>
</div>
<div
id=
"main"
style=
"width: 100%;height:300px;"
>
</div>
<div
style=
"width: 100%;margin-top: 30px;"
>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<div
class=
"lanstyle textbox"
>
<div>
未完款订单
</div>
<div
style=
"font-size: 38px;font-weight: 800;"
>
2
</div>
</div>
</el-col>
<el-col
:span=
"12"
>
<div
class=
"redstyle textbox"
>
<div>
课程进度未达标
</div>
<div
style=
"font-size: 38px;font-weight: 800;"
>
1
</div>
</div>
</el-col>
</el-row>
</div>
<div
style=
"width: 100%;margin-top: 30px;"
>
<el-row
:gutter=
"30"
>
<el-col
:span=
"12"
>
<div
class=
"justyle textbox"
>
<div>
本月预计
</div>
<div
style=
"font-size: 26px;font-weight: 800;margin-top: 20px;"
>
¥865
</div>
</div>
</el-col>
<el-col
:span=
"12"
>
<div
class=
"lvstyle textbox"
>
<div>
账单情况
</div>
<div
style=
"font-size: 20px;font-weight: 800;margin-top: 20px"
>
已出单
</div>
</div>
</el-col>
</el-row>
</div>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
...
...
src/pages/course/lessonPreparation.vue
View file @
f97efb7c
...
@@ -165,13 +165,24 @@
...
@@ -165,13 +165,24 @@
}
}
.prePare_Content
{
.prePare_Content
{
width
:
430px
;
/* width: 430px; */
min-height
:
100px
;
min-height
:
100px
;
height
:
auto
;
height
:
auto
;
background-color
:
#F0F5FB
;
background-color
:
#F0F5FB
;
padding
:
20px
;
padding
:
20px
;
margin
:
20px
auto
;
margin
:
20px
auto
;
}
}
.prePare_Content
h6
,
.prePare_Content
h5
,
.prePare_Content
h4
,
.prePare_Content
h3
,
.prePare_Content
h2
,
.prePare_Content
h1
{
font-size
:
unset
!important
;
line-height
:
unset
!important
;
letter-spacing
:
unset
!important
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"row"
>
<div
class=
"row"
>
...
@@ -213,7 +224,7 @@
...
@@ -213,7 +224,7 @@
教案名称:
<el-input
v-model=
"addMsg.LessonPlan"
placeholder=
"教案名称"
class=
"w260"
></el-input>
教案名称:
<el-input
v-model=
"addMsg.LessonPlan"
placeholder=
"教案名称"
class=
"w260"
></el-input>
<span
style=
"margin-left:30px;"
>
第
<span
style=
"margin-left:30px;"
>
第
<el-input
v-model=
"addMsg.CourseNum"
style=
"margin:0 5px;"
placeholder=
"第几课"
@
keyup
.
native=
"checkInteger(addMsg,'CourseNum')"
class=
"w60"
></el-input>
课
</span>
<el-input
v-model=
"addMsg.CourseNum"
style=
"margin:0 5px;"
placeholder=
"第几课"
@
keyup
.
native=
"checkInteger(addMsg,'CourseNum')"
class=
"w60"
></el-input>
课
</span>
<span
style=
"float:right;display:inline-block;"
>
<span
style=
"float:right;display:inline-block;
margin-left:20px;
"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"add"
label=
"选择模板"
@
click=
"getModule()"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"add"
label=
"选择模板"
@
click=
"getModule()"
/>
</span>
</span>
</div>
</div>
...
@@ -228,21 +239,21 @@
...
@@ -228,21 +239,21 @@
</div>
</div>
</div>
</div>
<div
class=
"teach_Content"
>
<div
class=
"teach_Content"
>
指導内容
教学目标
</div>
</div>
<div
style=
""
v-for=
"(item,index) in addMsg.LessonPlanList"
>
<div
style=
""
v-for=
"(item,index) in addMsg.LessonPlanList"
v-if=
"index==0"
>
<q-input
filled
stack-label
maxlength=
"50"
v-model=
"item.CourseTitle"
:dense=
"false"
class=
"col-12 q-pb-lg"
:label=
"item.CourseName+'項目'
"
/>
<q-input
filled
stack-label
maxlength=
"50"
v-model=
"item.CourseTitle"
:dense=
"false"
class=
"col-12 q-pb-lg"
label=
"教学目标
"
/>
</div>
</div>
<div
class=
"teach_Content"
>
<div
class=
"teach_Content"
>
指導項目
教学难点
</div>
</div>
<div
style=
""
v-for=
"(item,index) in addMsg.LessonPlanList"
>
<div
style=
""
v-for=
"(item,index) in addMsg.LessonPlanList"
v-if=
"index==0"
>
<
div
style=
"margin-top: 10px"
>
{{
item
.
CourseName
}}
</div
>
<
!--
<div
style=
"margin-top: 10px"
>
{{
item
.
CourseName
}}
</div>
--
>
<UeEditor
class=
"col-8"
v-model=
"item.LessonPlanProjectsList[0].ProjectContent"
:config=
"config"
></UeEditor>
<UeEditor
class=
"col-8"
v-model=
"item.LessonPlanProjectsList[0].ProjectContent"
:config=
"config"
></UeEditor>
</div>
</div>
<div
style=
""
v-for=
"(item,index) in addMsg.LessonPlanList"
>
<div
style=
""
v-for=
"(item,index) in addMsg.LessonPlanList"
v-if=
"index==0"
>
<div
class=
"teach_Content"
>
<div
class=
"teach_Content"
>
{{
item
.
CourseName
}}
上课内容
教学流程
</div>
</div>
<div
class=
"row q-gutter-xs cont"
v-for=
"(subItem,subIndex) in item.LessonPlanDetailsList"
style=
"margin-top:20px;align-items: self-end;width:100%;"
>
<div
class=
"row q-gutter-xs cont"
v-for=
"(subItem,subIndex) in item.LessonPlanDetailsList"
style=
"margin-top:20px;align-items: self-end;width:100%;"
>
...
@@ -320,6 +331,7 @@ export default {
...
@@ -320,6 +331,7 @@ export default {
this
.
msg
.
ClassId
=
this
.
$route
.
query
.
ClassId
;
this
.
msg
.
ClassId
=
this
.
$route
.
query
.
ClassId
;
this
.
msg
.
School_Id
=
this
.
$route
.
query
.
School_Id
;
this
.
msg
.
School_Id
=
this
.
$route
.
query
.
School_Id
;
this
.
msg
.
ClassPlanId
=
this
.
$route
.
query
.
ClassPlanId
;
this
.
msg
.
ClassPlanId
=
this
.
$route
.
query
.
ClassPlanId
;
this
.
addMsg
.
CourseNum
=
this
.
$route
.
query
.
Ranks
;
}
}
this
.
getList
();
this
.
getList
();
...
@@ -341,7 +353,7 @@ export default {
...
@@ -341,7 +353,7 @@ export default {
if
(
data
.
Chapter
)
{
if
(
data
.
Chapter
)
{
this
.
chapter
=
data
.
Chapter
this
.
chapter
=
data
.
Chapter
}
}
this
.
addMsg
.
CourseNum
=
data
.
CourseNum
;
//
this.addMsg.CourseNum = data.CourseNum;
this
.
addMsg
.
ClassId
=
data
.
ClassId
;
this
.
addMsg
.
ClassId
=
data
.
ClassId
;
this
.
addMsg
.
School_Id
=
data
.
School_Id
;
this
.
addMsg
.
School_Id
=
data
.
School_Id
;
this
.
addMsg
.
ClassPlanId
=
data
.
ClassPlanId
;
this
.
addMsg
.
ClassPlanId
=
data
.
ClassPlanId
;
...
...
src/pages/course/prepareclassDetails.vue
View file @
f97efb7c
This diff is collapsed.
Click to expand it.
src/pages/course/teacherLesson.vue
View file @
f97efb7c
This diff is collapsed.
Click to expand it.
src/pages/user/personalData.vue
View file @
f97efb7c
...
@@ -132,8 +132,8 @@
...
@@ -132,8 +132,8 @@
<span>
{{
showObj
.
DeptName
}}
</span>
<span>
{{
showObj
.
DeptName
}}
</span>
</div>
</div>
<!--
<div
class=
"box_l_title"
style=
"margin-top: 55px;"
>
概要信息
</div>
-->
<!--
<div
class=
"box_l_title"
style=
"margin-top: 55px;"
>
概要信息
</div>
-->
<div
:class=
"rightType==0?'box_l_title':'box_l_cen'"
@
click=
'rightType=0'
>
概要信息
</div>
<
!--
<
div
:class=
"rightType==0?'box_l_title':'box_l_cen'"
@
click=
'rightType=0'
>
概要信息
</div>
<div
:class=
"rightType==3?'box_l_title':'box_l_cen'"
@
click=
'rightType=3'
>
预警信息
</div>
<div
:class=
"rightType==3?'box_l_title':'box_l_cen'"
@
click=
'rightType=3'
>
预警信息
</div>
-->
<div
:class=
"rightType==1?'box_l_title':'box_l_cen'"
@
click=
'rightType=1'
>
账户资料
</div>
<div
:class=
"rightType==1?'box_l_title':'box_l_cen'"
@
click=
'rightType=1'
>
账户资料
</div>
<div
:class=
"rightType==2?'box_l_title':'box_l_cen'"
@
click=
'rightType=2'
>
密码修改
</div>
<div
:class=
"rightType==2?'box_l_title':'box_l_cen'"
@
click=
'rightType=2'
>
密码修改
</div>
</div>
</div>
...
@@ -225,6 +225,7 @@
...
@@ -225,6 +225,7 @@
NewSurePassWord
:
''
,
NewSurePassWord
:
''
,
}
}
import
summaryInfo
from
'../../components/user/summaryInfo'
import
summaryInfo
from
'../../components/user/summaryInfo'
import
Lockr
from
'lockr'
export
default
{
export
default
{
meta
:
{
meta
:
{
title
:
"个人资料"
title
:
"个人资料"
...
@@ -237,7 +238,7 @@
...
@@ -237,7 +238,7 @@
loading1
:
false
,
loading1
:
false
,
loading2
:
false
,
loading2
:
false
,
showObj
:
{},
showObj
:
{},
rightType
:
0
,
//右边显示类型
rightType
:
1
,
//右边显示类型
datamodify
:
{},
datamodify
:
{},
CompanyList
:
[],
CompanyList
:
[],
passwordMsg
:
Object
.
assign
({},
defaultpassword
),
passwordMsg
:
Object
.
assign
({},
defaultpassword
),
...
@@ -338,11 +339,9 @@
...
@@ -338,11 +339,9 @@
return
return
}
}
})
})
let
localStorageobj
=
{
Lockr
.
set
(
"loginUserInfo"
,
this
.
showObj
)
data
:
this
.
showObj
this
.
$store
.
dispatch
(
"setUserUpdate"
,
this
.
showObj
)
}
// location.reload()
localStorage
.
setItem
(
"loginUserInfo"
,
JSON
.
stringify
(
localStorageobj
)
);
location
.
reload
()
// this.$router.push({
// this.$router.push({
// path: this.redirect || '/home'
// path: this.redirect || '/home'
// })
// })
...
...
src/store/modules/user.js
View file @
f97efb7c
...
@@ -47,6 +47,9 @@ const user = {
...
@@ -47,6 +47,9 @@ const user = {
});
});
});
});
},
},
setUserUpdate
({
commit
},
u
){
commit
(
"SET_USERINFO"
,
u
);
},
// 获取权限
// 获取权限
getAuth
({
commit
})
{
getAuth
({
commit
})
{
...
...
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