Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
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
new-sing
admin-base
Commits
5a81b099
Commit
5a81b099
authored
Jan 04, 2019
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二维码管理bug
parent
fea2f530
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
16 deletions
+23
-16
dialog.vue
src/components/achievement/dialog.vue
+7
-1
index.vue
src/components/achievement/index.vue
+2
-2
userList.vue
src/components/class/userList.vue
+3
-3
dialog.vue
src/components/qrcode/dialog.vue
+2
-1
focusReplyDialog.vue
src/components/qrcode/focusReplyDialog.vue
+4
-4
index.vue
src/components/teacherDetail/index.vue
+2
-1
index.vue
src/components/userDetail/index.vue
+3
-4
No files found.
src/components/achievement/dialog.vue
View file @
5a81b099
...
@@ -70,6 +70,12 @@
...
@@ -70,6 +70,12 @@
this
.
classListOption
();
this
.
classListOption
();
},
},
classListOption
(){
classListOption
(){
if
(
this
.
dialogObj
.
timeValue
[
0
]
==
undefined
){
this
.
dialogObj
.
timeValue
[
0
]
=
""
}
if
(
this
.
dialogObj
.
timeValue
[
1
]
==
undefined
){
this
.
dialogObj
.
timeValue
[
1
]
=
""
}
let
json
=
{
let
json
=
{
page
:
this
.
nowPage
,
page
:
this
.
nowPage
,
limit
:
this
.
limit
,
limit
:
this
.
limit
,
...
...
src/components/achievement/index.vue
View file @
5a81b099
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
:data=
"firstList"
:data=
"firstList"
style=
"width: 100%"
>
style=
"width: 100%"
>
<el-table-column
<el-table-column
label=
"班主任
名字
"
label=
"班主任
姓名
"
>
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"nameClick(scope.row,searchFirstFrom.dateValue)"
>
<el-button
type=
"text"
@
click=
"nameClick(scope.row,searchFirstFrom.dateValue)"
>
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"班主任
名字
"
label=
"班主任
姓名
"
>
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"nameClick(scope.row)"
>
<el-button
type=
"text"
@
click=
"nameClick(scope.row)"
>
...
...
src/components/class/userList.vue
View file @
5a81b099
...
@@ -213,9 +213,9 @@
...
@@ -213,9 +213,9 @@
placement=
"top"
placement=
"top"
width=
"400"
>
width=
"400"
>
<div
style=
"text-align: center"
>
<div
style=
"text-align: center"
>
<el-button
type=
"warning"
size=
"mini"
plain
@
click=
"editPrivilege(scope.row)"
>
编辑
</el-button>
<el-button
type=
"warning"
size=
"mini"
plain
@
click=
"editPrivilege(scope.row)"
>
编辑
</el-button>
<el-button
type=
"primary"
size=
"mini"
plain
@
click=
"onGetUserDescList(scope.row)"
>
备注
</el-button>
<el-button
type=
"primary"
size=
"mini"
plain
@
click=
"onGetUserDescList(scope.row)"
>
备注
</el-button>
<el-button
type=
"primary"
size=
"mini"
plain
@
click=
"userLook(scope.row)"
v-if=
"!$store.state.readonly"
>
看课情况
</el-button>
<el-button
type=
"primary"
size=
"mini"
plain
@
click=
"userLook(scope.row)"
>
看课情况
</el-button>
<el-button
type=
"danger"
size=
"mini"
plain
@
click=
"onDel(scope.row)"
v-if=
"$store.state.deletePermission && !$store.state.readonly"
>
删除
</el-button>
<el-button
type=
"danger"
size=
"mini"
plain
@
click=
"onDel(scope.row)"
v-if=
"$store.state.deletePermission && !$store.state.readonly"
>
删除
</el-button>
</div>
</div>
<el-button
slot=
"reference"
size=
"mini"
type=
"text"
>
操作
</el-button>
<el-button
slot=
"reference"
size=
"mini"
type=
"text"
>
操作
</el-button>
...
...
src/components/qrcode/dialog.vue
View file @
5a81b099
...
@@ -338,8 +338,9 @@
...
@@ -338,8 +338,9 @@
this
.
dialogObj
=
{
this
.
dialogObj
=
{
show
:
true
,
show
:
true
,
index
:
index
,
index
:
index
,
desc
:
this
.
list
[
index
]
desc
:
this
.
list
[
index
]
,
}
}
},
},
addNew
(){
addNew
(){
this
.
dialogObj
=
{
this
.
dialogObj
=
{
...
...
src/components/qrcode/focusReplyDialog.vue
View file @
5a81b099
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<div
class=
"inner-bottom"
>
<div
class=
"inner-bottom"
>
<div
class=
"img-action"
v-if=
"type === 'image'"
>
<div
class=
"img-action"
v-if=
"type === 'image'"
>
<template
v-if=
"imageContent "
>
<template
v-if=
"imageContent "
>
<img
style=
"max-width:
80%
;"
v-if=
"imageContent.content"
:src=
"imageContent.content"
/>
<img
style=
"max-width:
60%;margin-bottom:20px
;"
v-if=
"imageContent.content"
:src=
"imageContent.content"
/>
</
template
>
</
template
>
<div
class=
"display-b"
>
<div
class=
"display-b"
>
<div
class=
"img-create-access"
v-if=
"!showMedia"
>
<div
class=
"img-create-access"
v-if=
"!showMedia"
>
...
@@ -330,9 +330,9 @@
...
@@ -330,9 +330,9 @@
page4
,
page4
,
emotion
emotion
},
},
//
mounted(){
mounted
(){
//
this.initDialog();
this
.
initDialog
();
//
},
},
watch
:{
watch
:{
'dialogObj.show'
(
value
){
'dialogObj.show'
(
value
){
if
(
value
){
if
(
value
){
...
...
src/components/teacherDetail/index.vue
View file @
5a81b099
...
@@ -121,7 +121,7 @@
...
@@ -121,7 +121,7 @@
label=
"创建时间"
>
label=
"创建时间"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"操作"
>
label=
"操作"
width=
"280"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
@
click=
"showUser(scope.row)"
size=
"mini"
plain
type=
"primary"
>
<el-button
@
click=
"showUser(scope.row)"
size=
"mini"
plain
type=
"primary"
>
班级成员
班级成员
...
@@ -130,6 +130,7 @@
...
@@ -130,6 +130,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<page
:total=
"total"
:limit=
"limit"
@
pageChange=
"onPageChange"
@
sizeChange=
"onSizeChange"
/>
<page
:total=
"total"
:limit=
"limit"
@
pageChange=
"onPageChange"
@
sizeChange=
"onSizeChange"
/>
<div
class=
"b-title"
>
月课订单列表
</div>
<div
class=
"b-title"
>
月课订单列表
</div>
<el-form
ref=
"form"
:model=
"form"
label-width=
"100px"
inline
>
<el-form
ref=
"form"
:model=
"form"
label-width=
"100px"
inline
>
...
...
src/components/userDetail/index.vue
View file @
5a81b099
...
@@ -153,9 +153,9 @@
...
@@ -153,9 +153,9 @@
label=
"操作"
width=
"400px"
>
label=
"操作"
width=
"400px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
@
click=
"showUser(scope.row)"
size=
"mini"
type=
"primary"
>
班级成员
</el-button>
<el-button
@
click=
"showUser(scope.row)"
size=
"mini"
type=
"primary"
>
班级成员
</el-button>
<el-button
size=
"mini"
type=
"warning"
@
click=
"editPrivilege(scope.row)"
>
编辑
</el-button>
<el-button
size=
"mini"
type=
"warning"
@
click=
"editPrivilege(scope.row)"
>
编辑
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"onGetUserDescList(scope.row)"
>
备注
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"onGetUserDescList(scope.row)"
>
备注
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"userLook(scope.row)"
v-if=
"!$store.state.readonly"
>
看课情况
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"userLook(scope.row)"
>
看课情况
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -629,7 +629,6 @@
...
@@ -629,7 +629,6 @@
}
,
}
,
onGetUserDescList
(
val
){
onGetUserDescList
(
val
){
this
.
descDialog
.
show
=
true
;
this
.
descDialog
.
show
=
true
;
this
.
descDialog
.
userInfo
=
{
this
.
descDialog
.
userInfo
=
{
user_id
:
val
.
user_id
,
user_id
:
val
.
user_id
,
avatar
:
this
.
detail
.
avatar
,
avatar
:
this
.
detail
.
avatar
,
...
...
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