Commit 728de33c authored by IvyXia123's avatar IvyXia123

成长记录更新

parent 1a04c7b2
This diff is collapsed.
...@@ -359,6 +359,54 @@ ...@@ -359,6 +359,54 @@
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="成长记录" name="growthRecord">
<el-table :data="growthRecordList">
<el-table-column
prop="element_title"
width="200"
label="歌曲名">
</el-table-column>
<el-table-column
prop="category_name"
width="200"
label="课程">
</el-table-column>
<el-table-column
prop="interest"
width="100"
label="兴趣度">
</el-table-column>
<el-table-column
prop="concent"
width="100"
label="专注度">
</el-table-column>
<el-table-column
prop="parent_child"
width="100"
label="亲子互动">
</el-table-column>
<el-table-column
prop="growth_record"
label="成长记录">
<template slot-scope="scope">
<el-popover
placement="top-start"
width="200"
trigger="hover"
:content="scope.row.growth_record">
<el-button slot="reference">{{scope.row.growth_record}}</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column
prop="created_at"
width="200"
label="提交时间">
</el-table-column>
</el-table>
<page :total="total" :limit="limit" @pageChange="onRecordPageChange" @sizeChange="onRecordSizeChange"/>
</el-tab-pane>
</el-tabs> </el-tabs>
<teacher-dialog :dialogObj="dialogObj" @reflash="getDetail"></teacher-dialog> <teacher-dialog :dialogObj="dialogObj" @reflash="getDetail"></teacher-dialog>
<user-list :userObj="userObj"/> <user-list :userObj="userObj"/>
...@@ -515,7 +563,8 @@ ...@@ -515,7 +563,8 @@
getyunjiApi, getyunjiApi,
fetchAddressListApi, fetchAddressListApi,
getSubAccountInfoApi, getSubAccountInfoApi,
getUserSubAccountListApi getUserSubAccountListApi,
getGrowthRecordApi
} from "../../service/api"; } from "../../service/api";
import page from '../framework/page' import page from '../framework/page'
import sourceDialog from '../order/sourceDialog' import sourceDialog from '../order/sourceDialog'
...@@ -644,7 +693,8 @@ ...@@ -644,7 +693,8 @@
} }
], ],
sourceByDateDialogJson: {}, sourceByDateDialogJson: {},
deliverRecordList: [] deliverRecordList: [],
growthRecordList:[]
} }
}, },
created() { created() {
...@@ -675,6 +725,10 @@ ...@@ -675,6 +725,10 @@
if (value === 'deliverRecord') { if (value === 'deliverRecord') {
this.getDeliverRecordList() this.getDeliverRecordList()
} }
if (value === 'growthRecord') {
this.getGrowthRecordList()
}
} }
}, },
...@@ -713,6 +767,13 @@ ...@@ -713,6 +767,13 @@
console.log(this.deliverRecordList) console.log(this.deliverRecordList)
}) })
}, },
getGrowthRecordList() {
getGrowthRecordApi({user_id: this.id, page: this.recordPage, limit: this.limit}).then(res => {
this.growthRecordList = res.list
this.total = res.total
console.log(this.growthRecordList)
})
},
onUpdateAddress() { onUpdateAddress() {
this.dialogObj.show = false; this.dialogObj.show = false;
this.getAddressList(); this.getAddressList();
...@@ -857,6 +918,15 @@ ...@@ -857,6 +918,15 @@
this.limit = val; this.limit = val;
this.getUser(); this.getUser();
}, },
onRecordPageChange(val) {
this.recordPage = val;
this.getGrowthRecordList();
},
onRecordSizeChange(val) {
this.recordPage = 1;
this.limit = val;
this.getGrowthRecordList();
},
getUser() { getUser() {
let json = { let json = {
user_id: this.id, user_id: this.id,
......
...@@ -1497,3 +1497,9 @@ export const getHourSingleApi = function (json) { ...@@ -1497,3 +1497,9 @@ export const getHourSingleApi = function (json) {
export const getHourTimeApi = function (json) { export const getHourTimeApi = function (json) {
return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/timeslotrecordlist`, json) return Vue.prototype.$fetch(`${_baseUrl}api/admin/teacher/timeslotrecordlist`, json)
}; };
// 成长记录
export const getGrowthRecordApi = function (json) {
return Vue.prototype.$fetch(`${_baseUrl}api/admin/user/growth/list`,json)
};
...@@ -233,6 +233,17 @@ export default [ ...@@ -233,6 +233,17 @@ export default [
value: '用户管理', value: '用户管理',
icon: 'icon-yonghu', icon: 'icon-yonghu',
list: [ list: [
{
value: '成长记录',
routerName: 'growthRecord',
path: '/growthRecord',
cover: '3-8',
router: {
path: '/growthRecord',
name: 'growthRecord',
component: e => require(['@/components/growthRecord'], e),
}
},
{ {
value: '用户列表', value: '用户列表',
routerName: 'user', routerName: 'user',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment