整体测试及优化,部分细节功能待完善

This commit is contained in:
2023-03-24 02:15:07 +08:00
parent 3f94ece6d4
commit 37402b0ea4
18 changed files with 273 additions and 139 deletions

View File

@@ -134,6 +134,8 @@ function getStateName(state) {
<div class="di-right">{{assistantInfo.valid_num}}</div>
</div>
</div>
</div>
<div class="detail-info-box">
<div class="dib-row">
<div class="dib-item">
<div class="di-left">管理学员</div>
@@ -143,75 +145,79 @@ function getStateName(state) {
<div class="dib-row">
<div class="dib-item">
<div class="di-left">课程订单</div>
<div class="di-right">{{assistantInfo.course_num}}</div>
<div class="di-right">{{assistantInfo.student_info?.course_num}}</div>
</div>
<div class="dib-item">
<div class="di-left">课程收益</div>
<div class="di-right">{{assistantInfo.course_income}}</div>
<div class="di-right">{{assistantInfo.student_info?.course_income}}</div>
</div>
</div>
<div class="dib-row">
<div class="dib-item">
<div class="di-left">试卷订单</div>
<div class="di-right">{{assistantInfo.exam_num}}</div>
<div class="di-right">{{assistantInfo.student_info?.exam_num}}</div>
</div>
<div class="dib-item">
<div class="di-left">试卷收益</div>
<div class="di-right">{{assistantInfo.exam_income}}</div>
<div class="di-right">{{assistantInfo.student_info?.exam_income}}</div>
</div>
</div>
</div>
<div class="detail-info-box">
<div class="dib-row">
<div class="dib-item">
<div class="di-left">推荐老师</div>
<div class="di-right">{{assistantInfo.teacher_num}}</div>
</div>
</div>
<!-- <div class="dib-row">-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">授课总订单</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">授课总收益</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="dib-row">-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">试卷总订单</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">试卷总收益</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="dib-row">
<div class="dib-item">
<div class="di-left">授课总订单</div>
<div class="di-right">{{assistantInfo.teacher_info?.course_num}}</div>
</div>
<div class="dib-item">
<div class="di-left">授课总收益</div>
<div class="di-right">{{assistantInfo.teacher_info?.course_income}}</div>
</div>
</div>
<div class="dib-row">
<div class="dib-item">
<div class="di-left">试卷总订单</div>
<div class="di-right">{{assistantInfo.teacher_info?.exam_num}}</div>
</div>
<div class="dib-item">
<div class="di-left">试卷总收益</div>
<div class="di-right">{{assistantInfo.teacher_info?.exam_income}}</div>
</div>
</div>
</div>
<div class="detail-info-box">
<div class="dib-row">
<div class="dib-item">
<div class="di-left">推荐助教</div>
<div class="di-right">{{assistantInfo.assistant_num}}</div>
</div>
</div>
<!-- <div class="dib-row">-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">课程总订单</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">课程总收益</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="dib-row">-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">试卷总订单</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- <div class="dib-item">-->
<!-- <div class="di-left">试卷总收益</div>-->
<!-- <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="dib-row">
<div class="dib-item">
<div class="di-left">课程总订单</div>
<div class="di-right">{{assistantInfo.assistant_info?.course_num}}</div>
</div>
<div class="dib-item">
<div class="di-left">课程总收益</div>
<div class="di-right">{{assistantInfo.assistant_info?.course_income}}</div>
</div>
</div>
<div class="dib-row">
<div class="dib-item">
<div class="di-left">试卷总订单</div>
<div class="di-right">{{assistantInfo.assistant_info?.exam_num}}</div>
</div>
<div class="dib-item">
<div class="di-left">试卷总收益</div>
<div class="di-right">{{assistantInfo.assistant_info?.exam_income}}</div>
</div>
</div>
</div>
<!-- 操作区域-->
@@ -289,6 +295,10 @@ function getStateName(state) {
}
.gva-table-box{
.detail-info-box{
margin-bottom: 10px;
border-bottom: 1px solid #f0f2f5;
padding-bottom: 10px;
box-shadow: 10px 2px 7px #f0f2f5;
.dib-row{
overflow: hidden;
.link-item{

View File

@@ -51,7 +51,7 @@ const total = ref(0)
// })
const question_id = ref(0)
const content = ref(null)
const teacher_ids = ref([])
const asistant_ids = ref([])
// 生命周期
onMounted(() => {
getAssistantList()
@@ -85,8 +85,8 @@ const onReset = () => {
}
}
async function onDelete() {
const ids = teacher_ids.value
const res = await api.delExamination({ teacher_ids:ids })
const ids = asistant_ids.value
const res = await api.delExamination({ asistant_ids:ids })
if (res.code === 0) {
ElMessage({
type: 'success',
@@ -97,7 +97,7 @@ async function onDelete() {
}
}
const handleSelectionChange = (val) => {
teacher_ids.value = val.map((item) => {
asistant_ids.value = val.map((item) => {
return item.teacher_info_id
})
}
@@ -119,12 +119,12 @@ const pFormRules = ref({
})
const p_type = ref(null); // 审核类型
const pForm = ref({})
const teacher_id = ref(0)
const asistant_id = ref(0)
const p_title = ref('')
function processFunc(row,state) { // 审核
p_type.value = state
p_visible.value = true
teacher_id.value = row.user_id
asistant_id.value = row.user_id
if(state === 3) { //同意
p_title.value = '审核同意'
}
@@ -136,17 +136,18 @@ function close_pv(){
p_visible.value = false
}
async function pOk() { // 审核提交
const res = await api.teacherOperator({
teacher_id:teacher_id.value,
const res = await api.assistantOperator({
assistant_id:asistant_id.value,
status:p_type.value,
desc:pForm.value.desc
})
ElMessage({
type: 'success',
message: res.data.msg
message: res.msg
})
if(res.code === 0) {
close_pv()
getAssistantList()
}
}
</script>
@@ -206,6 +207,11 @@ async function pOk() { // 审核提交
{{scope.row.province>-1?cityList[scope.row.province].name:'无'}}
</template>
</el-table-column>
<el-table-column align="center" label="状态" min-width="150">
<template #default="scope">
{{scope.row.status==1?'申请中':scope.row.status==2?'已拒绝':'已同意'}}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="管理学员" prop="invite_id" />-->
<!-- <el-table-column align="center" label="课程订单" prop="invite_id" />-->
<!-- <el-table-column align="center" label="收益" prop="invite_id" />-->

View File

@@ -57,20 +57,20 @@ const user_list = ref([])
// 生命周期
onMounted(() => {
getManagerList()
getUserList()
// getUserList()
})
// provide('subjectList', subjectList)
// provide('current_subject', current_subject)
// 方法
async function getUserList() {
const res = await capi.getUserList({
page:1,
pageSize:1000
})
if(res.code === 0) {
user_list.value = res.data.records
}
}
// async function getUserList() {
// const res = await capi.getUserList({
// page:1,
// pageSize:1000
// })
// if(res.code === 0) {
// user_list.value = res.data.records
// }
// }
async function getManagerList() {
const res = await api.getManagerList(queryParams.value)
if(res.code === 0) {
@@ -182,6 +182,20 @@ async function saveData() {
dialogVisible.value = false
}
}
/*搜索用户相关*/
const selectLoading = ref(false)
async function remoteMethod(query) {
selectLoading.value = true
const res = await capi.getUserList({
name:query,
page:1,
pageSize:100
})
selectLoading.value = false
if(res.code === 0) {
user_list.value = res.data.records
}
}
</script>
<template>
<div>
@@ -298,9 +312,26 @@ async function saveData() {
</el-select>
</el-form-item>
<el-form-item label="用户ID" prop="user_id">
<el-select v-model="mForm.user_id" clearable placeholder="请选择">
<!-- <el-select v-model="mForm.user_id" clearable placeholder="请选择">-->
<!-- <el-option-->
<!-- v-for="(item,index) in user_list"-->
<!-- :key="item.user_id"-->
<!-- :label="item.nickname"-->
<!-- :value="item.user_id"-->
<!-- />-->
<!-- </el-select>-->
<el-select
v-model="mForm.user_id"
filterable
remote
reserve-keyword
placeholder="搜索用户"
remote-show-suffix
:remote-method="remoteMethod"
>
<el-option
v-for="(item,index) in user_list"
v-for="item in user_list"
:key="item.user_id"
:label="item.nickname"
:value="item.user_id"