From e6b377a88c8ada83a6397e4a7a7d428f89014237 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期一, 24 六月 2024 10:18:32 +0800 Subject: [PATCH] 修改 --- .env.development | 4 +- src/views/onlineEducation/platformManage/index.vue | 57 ++++++++++++++++++++++++++-- src/views/onlineEducation/courseSupervision/index.vue | 16 ++++---- src/views/onlineEducation/learnRecord/components/detailDialog.vue | 24 +++++++---- src/views/onlineEducation/learnRecord/index.vue | 2 5 files changed, 78 insertions(+), 25 deletions(-) diff --git a/.env.development b/.env.development index 9cad27f..f54a4b0 100644 --- a/.env.development +++ b/.env.development @@ -9,10 +9,10 @@ #VUE_APP_BASE_API = 'http://192.168.0.47:8085/api' #张凤 -@VUE_APP_BASE_API = 'http://192.168.0.70:8085/api' +#VUE_APP_BASE_API = 'http://192.168.2.11:8085/api' #线上 -VUE_APP_BASE_API = 'http://121.239.169.30:8086/api' +VUE_APP_BASE_API = 'http://106.15.95.149:8086/api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/views/onlineEducation/courseSupervision/index.vue b/src/views/onlineEducation/courseSupervision/index.vue index dcda9a4..c9fec5d 100644 --- a/src/views/onlineEducation/courseSupervision/index.vue +++ b/src/views/onlineEducation/courseSupervision/index.vue @@ -38,7 +38,7 @@ <span style="color: #1890ff;cursor: pointer" @click="openStudent(scope.row)">{{scope.row.student}}</span> </template> </el-table-column> - <el-table-column label="审核状态" align="center" prop="state" /> +<!-- <el-table-column label="审核状态" align="center" prop="state" />--> <el-table-column label="删除标识" align="center" prop="delFlag" /> <el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="最近修改时间" align="center" prop="updateTime" /> @@ -49,13 +49,13 @@ type="text" style="color: #1890ff" >预览课程</el-button> - <el-button - v-if="scope.row.state == '未审核'" - size="mini" - type="text" - style="color: #1890ff" - @click="check(scope.row)" - >审核</el-button> +<!-- <el-button--> +<!-- v-if="scope.row.state == '未审核'"--> +<!-- size="mini"--> +<!-- type="text"--> +<!-- style="color: #1890ff"--> +<!-- @click="check(scope.row)"--> +<!-- >审核</el-button>--> </template> </el-table-column> </el-table> diff --git a/src/views/onlineEducation/examManage/components/detailDialog.vue b/src/views/onlineEducation/learnRecord/components/detailDialog.vue similarity index 92% rename from src/views/onlineEducation/examManage/components/detailDialog.vue rename to src/views/onlineEducation/learnRecord/components/detailDialog.vue index 2068d86..06262e5 100644 --- a/src/views/onlineEducation/examManage/components/detailDialog.vue +++ b/src/views/onlineEducation/learnRecord/components/detailDialog.vue @@ -39,16 +39,22 @@ style="width: 80%;margin-left: 50px"> <el-table-column prop="learningTime" - label="学习时长" - width="180"> + label="学习时长"> </el-table-column> <el-table-column prop="startTime" - label="开始时间" - width="180"> + label="开始时间"> + </el-table-column> + <el-table-column + prop="startTime" + label="开始位置"> </el-table-column> <el-table-column label="结束时间" + prop="endTime"> + </el-table-column> + <el-table-column + label="结束位置" prop="endTime"> </el-table-column> </el-table> @@ -76,11 +82,6 @@ :data="examTable" style="width: 80%;margin: 10px 25px"> <el-table-column - prop="learningTime" - label="学习时长" - width="180"> - </el-table-column> - <el-table-column prop="startTime" label="开始时间" width="180"> @@ -89,6 +90,11 @@ label="结束时间" prop="endTime"> </el-table-column> + <el-table-column + prop="learningTime" + label="时间间隔" + width="180"> + </el-table-column> </el-table> </div> </div> diff --git a/src/views/onlineEducation/learnRecord/index.vue b/src/views/onlineEducation/learnRecord/index.vue index 51d616d..0a89696 100644 --- a/src/views/onlineEducation/learnRecord/index.vue +++ b/src/views/onlineEducation/learnRecord/index.vue @@ -33,7 +33,7 @@ </template> <script> -import detailDialog from '@/views/onlineEducation/examManage/components/detailDialog.vue' +import detailDialog from './components/detailDialog.vue' export default { name: "nPeopleManage", dicts: [], diff --git a/src/views/onlineEducation/platformManage/index.vue b/src/views/onlineEducation/platformManage/index.vue index 06ae0cf..4c8f993 100644 --- a/src/views/onlineEducation/platformManage/index.vue +++ b/src/views/onlineEducation/platformManage/index.vue @@ -14,19 +14,30 @@ <el-table-column label="联系人" align="center" prop="people" /> <el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="更新时间" align="center" prop="updateTime" /> + <el-table-column label="是否禁用" align="center" prop="isDisabled" /> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template #default="scope"> <el-button size="mini" type="text" - icon="el-icon-view" + v-if="scope.row.isDisabled === '是'" + @click="handleEnable(scope.row)" + >启用</el-button> + <el-button + size="mini" + type="text" + v-if="scope.row.isDisabled === '否'" + @click="handleDisable(scope.row)" + >监管禁用</el-button> + <el-button + size="mini" + type="text" @click="handleAdd('edit',scope.row)" >修改</el-button> <el-button size="mini" type="text" style="color: #f56c6c" - icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:experts:remove']" >删除</el-button> @@ -87,7 +98,8 @@ SecretKey: '12345', people: '张三', phone: '13453456456', - updateTime: '2024-6-11 10:32:00 ' + updateTime: '2024-6-11 10:32:00 ', + isDisabled: '是' }, { @@ -97,7 +109,8 @@ SecretKey: '16665', people: '李四', phone: '13453456456', - updateTime: '2024-6-11 10:33:00 ' + updateTime: '2024-6-11 10:33:00 ', + isDisabled: '否' } ] @@ -123,7 +136,41 @@ }, handleAdd(type,data){ this.$refs.addDialogRef.openDialog(type, data); - } + }, + handleEnable(data){ + this.$confirm('确认启用该平台?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // delExam( val.siteId).then((res) => { + // if (res.code == 200) { + // this.$message({ + // type:'success', + // message: '删除成功' + // }) + // this.getList() + // } + // }) + }) + }, + handleDisable(data){ + this.$confirm('确认禁用该平台?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // delExam( val.siteId).then((res) => { + // if (res.code == 200) { + // this.$message({ + // type:'success', + // message: '删除成功' + // }) + // this.getList() + // } + // }) + }) + }, } }; </script> -- Gitblit v1.9.2