From e3bfce922c47cf8706be6eada6f5edbd38f39316 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Fri, 19 Jul 2024 13:48:43 +0800
Subject: [PATCH] bug修改
---
src/views/onlineEducation/systemManage/courseClassification/index.vue | 23 +
src/views/onlineEducation/courseManage/courseResource/index.vue | 40 ++
src/views/onlineEducation/groupExams/components/student.vue | 75 ++++-
src/views/onlineEducation/systemManage/company/index.vue | 40 ++
src/views/onlineEducation/systemManage/user/index.vue | 74 +++++
src/views/onlineEducation/courseManage/index.vue | 40 ++
src/views/onlineEducation/count/index.vue | 75 +++--
src/views/onlineEducation/classHourBatch/index.vue | 73 ++++
src/views/onlineEducation/questionBankManagement/index.vue | 40 ++
src/views/onlineEducation/classHourBatch/components/handleStudent.vue | 52 +++
src/views/onlineEducation/courseManage/courseResource/componets/resourceDialog.vue | 4
src/views/onlineEducation/people/index.vue | 46 ++
src/views/onlineEducation/questionBankManagement/questionManage/index.vue | 17
src/views/onlineEducation/courseManage/courseChapters/components/chooseResource.vue | 1
src/views/onlineEducation/groupExams/index.vue | 98 ++++++
src/views/onlineEducation/offlineEducation/index.vue | 63 ++++
16 files changed, 608 insertions(+), 153 deletions(-)
diff --git a/src/views/onlineEducation/classHourBatch/components/handleStudent.vue b/src/views/onlineEducation/classHourBatch/components/handleStudent.vue
index c9cd42e..b02d810 100644
--- a/src/views/onlineEducation/classHourBatch/components/handleStudent.vue
+++ b/src/views/onlineEducation/classHourBatch/components/handleStudent.vue
@@ -1,25 +1,44 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between">
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog()"
+ >选择学员</el-button>
+ </el-form-item>
+ <el-form-item label="学生姓名：" >
+ <el-input v-model="data.queryParams.studentName" placeholder="请输入学生姓名"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
<div>
<el-button
- type="primary"
+ type="danger"
plain
- icon="Plus"
- @click="openDialog()"
- >选择学员</el-button>
+ icon="Delete"
+ @click="handleDeleteBatch"
+ >批量删除</el-button>
<el-button
type="primary"
plain
@click="back"
>返回</el-button>
</div>
- <el-button
- type="danger"
- plain
- icon="Delete"
- @click="handleDeleteBatch"
- >批量删除</el-button>
+
</div>
<!-- 表格数据 -->
<el-table ref="tableRef" v-loading="loading" :data="dataList" :border="true" :row-key="getRowKey" @selection-change="handleSelectionChange">
@@ -71,6 +90,7 @@
phaseId: null,
pageNum: 1,
pageSize: 10,
+ studentName: ''
},
total: 0,
dataList: [],
@@ -119,7 +139,15 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ studentName: '',
+ phaseId: data.queryParams.phaseId,
+ pageId: data.queryParams.pageId
+ }
+
+ getList()
}
const handleSelectionChange = (val) => {
diff --git a/src/views/onlineEducation/classHourBatch/index.vue b/src/views/onlineEducation/classHourBatch/index.vue
index 71bcabd..8de4403 100644
--- a/src/views/onlineEducation/classHourBatch/index.vue
+++ b/src/views/onlineEducation/classHourBatch/index.vue
@@ -1,12 +1,41 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增批次</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增批次</el-button>
+ </el-form-item>
+ <el-form-item label="批次名称：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入批次名称"></el-input>
+ </el-form-item>
+ <el-form-item label="批次级别：" >
+ <el-select
+ v-model="data.queryParams.level"
+ class="w100"
+ style="max-width: 180px"
+ clearable
+ size="default"
+ >
+ <el-option v-for="item in data.levelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
<span v-if="!data.isAdmin" style="font-size: 19px;font-weight: 600;margin-right: 20px">
{{data.companyName}},您的企业当前系统可用课时总计
<span style="font-size: 19px;font-weight: 600;color: #1ab394">{{data.remainPeriod}}</span> 分钟。<span @click="openDetail" style="cursor: pointer; font-size: 19px;font-weight: 600;color: #1890ff">[明细]</span>
@@ -67,6 +96,8 @@
const classHourRef = ref();
const data = reactive({
queryParams: {
+ name: '',
+ level: null,
pageNum: 1,
pageSize: 10,
},
@@ -75,7 +106,25 @@
isAdmin: false,
companyName: '',
remainPeriod: null,
- companyId: null
+ companyId: null,
+ levelList: [
+ {
+ id: 1,
+ name: '公司级 '
+ },
+ {
+ id: 2,
+ name: '部门级'
+ },
+ {
+ id: 3,
+ name: '车间级'
+ },
+ {
+ id: 4,
+ name: '其他'
+ },
+ ],
});
@@ -122,7 +171,13 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ name: '',
+ level: null,
+ pageNum: 1,
+ pageSize: 10,
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/count/index.vue b/src/views/onlineEducation/count/index.vue
index c2030dd..4efa22c 100644
--- a/src/views/onlineEducation/count/index.vue
+++ b/src/views/onlineEducation/count/index.vue
@@ -1,21 +1,25 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
+ <div>
<el-form style="display: flex;flex-wrap: wrap">
<el-form-item label="企业:" v-if="state.isAdmin">
<el-select
- v-model="state.queryParams.companyId"
- style="width: 100%"
- v-loadMore="loadMore"
- class="m-2"
- placeholder="请选择所属企业"
- popper-class="more_select_dropdown"
+ v-model="state.queryParams.companyName"
+ filterable
+ remote
+ @change="selectValue"
+ reserve-keyword
+ placeholder="请输入企业名称"
+ remote-show-suffix
+ :remote-method="getCompanyList"
+ :loading="loadingCompany"
+ style="width: 240px"
>
<el-option
v-for="item in state.companyList"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="item.name"
/>
</el-select>
</el-form-item>
@@ -121,9 +125,9 @@
const userInfo = JSON.parse(Cookies.get('userInfo'))
console.log("userInfo",userInfo)
state.isAdmin = userInfo.userType === 0;
- if(state.isAdmin){
- getCompanyList();
- }
+ // if(state.isAdmin){
+ // getCompanyList();
+ // }
getList();
@@ -145,44 +149,42 @@
}
loading.value = false;
}
+const selectValue = (val) => {
+ state.companyList.forEach(item => {
+ if(item.name === val){
+ state.queryParams.companyId = item.id
+ }
+ })
+}
const finshed = ref(false)
-const getCompanyList = async (type)=>{
- if (type === 'open' && state.pageNum !== 1) {
- } else {
+const loadingCompany = ref(false)
+const getCompanyList = async (val)=>{
+ if(val != ""){
+ loadingCompany.value = true;
const queryParams = {
- pageNum: state.pageNum,
- pageSize: state.pageSize,
+ name: val
}
const res = await getCompany(queryParams)
if (res.code == 200) {
- if (res.data.pageNum === state.pageNum) {
- finshed.value = false;
- if (state.pageNum == 1) {
- state.companyList = res.data.list
- } else {
- state.companyList = state.companyList.concat(res.data.list)
- }
- } else {
- finshed.value = true;
- }
+ loadingCompany.value = false;
+ state.companyList = res.data.list
} else {
ElMessage.warning(res.message)
}
- console.log("state.companyList",state.companyList)
}
}
//触底函数
-const loadMore = () => {
- console.log(' 触底了');
- // 防抖处理
- setTimeout(() => {
- if (finshed.value) return //值为true，则代表没有数据了
- state.pageNum += 1
- getCompanyList('')
- }, 500)
-}
+// const loadMore = () => {
+// console.log(' 触底了');
+// // 防抖处理
+// setTimeout(() => {
+// if (finshed.value) return //值为true，则代表没有数据了
+// state.pageNum += 1
+// // getCompanyList('')
+// }, 500)
+// }
const setDate = () => {
let isDate = new Date()
let sTime = `${isDate.getFullYear()}-${isDate.getMonth() + 1}-${isDate.getDate()-7}`
@@ -221,6 +223,7 @@
pageSize: 10,
}
searchTime.value = [];
+ state.companyList = [];
getList();
}
diff --git a/src/views/onlineEducation/courseManage/courseChapters/components/chooseResource.vue b/src/views/onlineEducation/courseManage/courseChapters/components/chooseResource.vue
index cc2b561..3c1a371 100644
--- a/src/views/onlineEducation/courseManage/courseChapters/components/chooseResource.vue
+++ b/src/views/onlineEducation/courseManage/courseChapters/components/chooseResource.vue
@@ -27,6 +27,7 @@
<span>{{scope.row.resourceType == 1 ? '视频':scope.row.resourceType == 2 ? '音频':'文档'}}</span>
</template>
</el-table-column>
+ <el-table-column label="上传时间" prop="createTime" align="center" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template #default="scope">
<el-button link type="primary" @click="choose(scope.row)">选择</el-button>
diff --git a/src/views/onlineEducation/courseManage/courseResource/componets/resourceDialog.vue b/src/views/onlineEducation/courseManage/courseResource/componets/resourceDialog.vue
index aa99e98..1936140 100644
--- a/src/views/onlineEducation/courseManage/courseResource/componets/resourceDialog.vue
+++ b/src/views/onlineEducation/courseManage/courseResource/componets/resourceDialog.vue
@@ -263,6 +263,10 @@
const onSubmit = async () => {
const valid = await busRef.value.validate();
if(valid){
+ if(state.form.resourcePath == ''){
+ ElMessage.warning('请上传资源')
+ return
+ }
if(title.value === '资源新增'){
const {id,...data} = JSON.parse(JSON.stringify(state.form))
const res = await addResource(data)
diff --git a/src/views/onlineEducation/courseManage/courseResource/index.vue b/src/views/onlineEducation/courseManage/courseResource/index.vue
index c4c5968..c4ae811 100644
--- a/src/views/onlineEducation/courseManage/courseResource/index.vue
+++ b/src/views/onlineEducation/courseManage/courseResource/index.vue
@@ -1,12 +1,30 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
+ <el-form-item label="资源名称：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入资源名称"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -67,6 +85,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ name: ''
},
total: 0,
dataList: []
@@ -124,7 +143,12 @@
}
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ name: ''
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/courseManage/index.vue b/src/views/onlineEducation/courseManage/index.vue
index a8eb3ee..67c8f8e 100644
--- a/src/views/onlineEducation/courseManage/index.vue
+++ b/src/views/onlineEducation/courseManage/index.vue
@@ -1,12 +1,30 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
+ <el-form-item label="课程名称：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入课程名称"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -151,6 +169,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ name: ''
},
total: 0,
dataList: [],
@@ -203,7 +222,12 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ name: ''
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/groupExams/components/student.vue b/src/views/onlineEducation/groupExams/components/student.vue
index ba9af7d..261f621 100644
--- a/src/views/onlineEducation/groupExams/components/student.vue
+++ b/src/views/onlineEducation/groupExams/components/student.vue
@@ -1,25 +1,55 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between">
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog()"
+ >选择学员</el-button>
+ </el-form-item>
+ <el-form-item label="学生姓名：" >
+ <el-input v-model="data.queryParams.studentName" placeholder="请输入学生姓名"></el-input>
+ </el-form-item>
+ <el-form-item label="考试是否完成：" >
+ <el-select
+ v-model="data.queryParams.completed"
+ class="w100"
+ style="max-width: 180px"
+ clearable
+ size="default"
+ >
+ <el-option v-for="item in data.completeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
<div>
<el-button
- type="primary"
+ type="danger"
plain
- icon="Plus"
- @click="openDialog()"
- >选择学员</el-button>
+ icon="Delete"
+ @click="handleDeleteBatch"
+ >批量删除</el-button>
<el-button
type="primary"
plain
@click="back"
>返回</el-button>
</div>
- <el-button
- type="danger"
- plain
- icon="Delete"
- @click="handleDeleteBatch"
- >批量删除</el-button>
+
</div>
<!-- 表格数据 -->
<el-table ref="tableRef" v-loading="loading" :data="dataList" :border="true" :row-key="getRowKey" @selection-change="handleSelectionChange">
@@ -93,13 +123,25 @@
const data = reactive({
queryParams: {
paperId: null,
+ studentName: '',
+ completed: null,
pageNum: 1,
pageSize: 10,
},
total: 0,
dataList: [],
isAdmin: false,
- chooseStu: []
+ chooseStu: [],
+ completeList: [
+ {
+ id: 1,
+ name: '是'
+ },
+ {
+ id: 0,
+ name: '否'
+ }
+ ]
});
@@ -147,7 +189,14 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ paperId: data.queryParams.paperId,
+ studentName: '',
+ completed: null,
+ pageNum: 1,
+ pageSize: 10,
+ }
+ getList()
}
const handleSelectionChange = (val) => {
diff --git a/src/views/onlineEducation/groupExams/index.vue b/src/views/onlineEducation/groupExams/index.vue
index f232e26..6fa05ec 100644
--- a/src/views/onlineEducation/groupExams/index.vue
+++ b/src/views/onlineEducation/groupExams/index.vue
@@ -1,11 +1,41 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between">
- <el-button
- type="primary"
- plain
- @click="openDialog('add',{})"
- >开始组卷考试</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ @click="openDialog('add',{})"
+ >开始组卷考试</el-button>
+ </el-form-item>
+ <el-form-item label="考试名称：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入考试名称"></el-input>
+ </el-form-item>
+ <el-form-item label="科目/类别：" >
+ <el-cascader
+ style="width: 100%"
+ ref="classifyRef"
+ v-model="data.queryParams.categoryId"
+ :options="data.classifyList"
+ :props="data.props"
+ clearable
+ :show-all-levels="false"
+ @change="handleChange"
+ />
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -72,14 +102,18 @@
import {delQuestionBank, getQuestionBank} from "@/api/onlineEducation/questionBank";
import {delBatch, getBatch} from "@/api/onlineEducation/batch";
import {delExam, getExam} from "@/api/onlineEducation/exam";
+import {getClassification} from "@/api/onlineEducation/courseClass";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const dialogRef = ref();
const questionRef = ref();
+const classifyRef = ref(null)
const data = reactive({
queryParams: {
+ name:'',
+ categoryId: null,
pageNum: 1,
pageSize: 10,
},
@@ -87,7 +121,11 @@
dataList: [],
isAdmin: false,
companyName: '',
- remainPeriod: null
+ remainPeriod: null,
+ categoryList: [],
+ props: {
+ checkStrictly: true,
+ },
});
@@ -102,6 +140,7 @@
data.isAdmin = false;
data.companyName = userInfo.companyName
}
+ await getClassifyList();
await getList()
})
onUnmounted(()=>{
@@ -133,7 +172,13 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ name:'',
+ categoryId: null,
+ pageNum: 1,
+ pageSize: 10,
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
@@ -161,4 +206,41 @@
const viewQuestion = (val) => {
questionRef.value.openDialog(val)
}
+const handleChange = ()=> {
+ console.log("label====",classifyRef.value.getCheckedNodes()[0].value)
+ data.queryParams.categoryId = classifyRef.value.getCheckedNodes()[0].value
+ // 我这里只是打印了一下label的值哦，需要赋值的话自己去赋值哦
+ if (classifyRef.value.popperVisible) {
+ classifyRef.value.togglePopperVisible()
+ }
+}
+const getClassifyList = async () => {
+ const res = await getClassification();
+ if(res.code === 200){
+ data.classifyList = recursion(res.data)
+ }else{
+ ElMessage.warning(res.message)
+ }
+}
+const recursion = (data) => {
+ let tmp = []
+ for (let i = 0; i < data.length; i++) {
+ let item = data[i]
+ // children为空
+ if (item.children&& item.children.length==0) {
+ tmp.push({
+ value: item.id,
+ label: item.name
+ })
+ // 有children
+ } else {
+ tmp.push({
+ value: item.id,
+ label: item.name,
+ children:recursion(item.children)
+ })
+ }
+ }
+ return tmp;
+}
</script>
diff --git a/src/views/onlineEducation/offlineEducation/index.vue b/src/views/onlineEducation/offlineEducation/index.vue
index 75731b5..3e7836d 100644
--- a/src/views/onlineEducation/offlineEducation/index.vue
+++ b/src/views/onlineEducation/offlineEducation/index.vue
@@ -1,15 +1,44 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- @click="openDialog('add',{})"
- >新增登记</el-button>
- <el-button
- type="primary"
- plain
- >批量导入</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增登记</el-button>
+ </el-form-item>
+ <el-form-item label="企业名称：" >
+ <el-input v-model="data.queryParams.companyName" placeholder="请输入企业名称"></el-input>
+ </el-form-item>
+ <el-form-item label="课程名称：" >
+ <el-input v-model="data.queryParams.courseName" placeholder="请输入课程名称"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
+<!-- <div style="margin-bottom: 10px">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- @click="openDialog('add',{})"-->
+<!-- >新增登记</el-button>-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- >批量导入</el-button>-->
+<!-- </div>-->
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
<el-table-column label="序号" type="index" align="center" width="80" />
@@ -23,7 +52,11 @@
</el-table-column>
<el-table-column label="身份证号" prop="idNo" align="center" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="课程名称" prop="courseName" align="center"/>
- <el-table-column label="培训等级" prop="level" align="center"/>
+ <el-table-column label="培训等级" prop="level" align="center">
+ <template #default="scope">
+ <span>{{scope.row.sex == 1 ? '公司级':scope.row.sex == 2 ? '部门级' : '车间级'}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="要求课时（分）" prop="period" align="center"/>
<el-table-column label="实际课时（分）" prop="actualPeriod" align="center"/>
<el-table-column label="考试成绩" prop="score" align="center"/>
@@ -62,6 +95,8 @@
const dialogRef = ref();
const data = reactive({
queryParams: {
+ companyName: '',
+ courseName: '',
pageNum: 1,
pageSize: 10,
},
@@ -106,7 +141,13 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ companyName: '',
+ courseName: '',
+ pageNum: 1,
+ pageSize: 10,
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/people/index.vue b/src/views/onlineEducation/people/index.vue
index 24726f1..93459d9 100644
--- a/src/views/onlineEducation/people/index.vue
+++ b/src/views/onlineEducation/people/index.vue
@@ -1,12 +1,30 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
+ <el-form-item label="姓名：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入姓名"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -20,7 +38,11 @@
</el-table-column>
<el-table-column label="手机号" prop="phone" align="center" width="130"/>
<el-table-column label="身份证" prop="idNo" align="center" width="200" :show-overflow-tooltip="true"/>
- <el-table-column label="创建人" prop="createBy" align="center"/>
+ <el-table-column label="创建人" prop="createBy" align="center">
+ <template #default="scope">
+ <span>{{scope.row.createUser.name}}</span>
+ </template>
+ </el-table-column>
<el-table-column label="工作岗位" prop="post" align="center"/>
<el-table-column label="职务" prop="duty" align="center"/>
<el-table-column label="一人一档" prop="duty" align="center" width="120">
@@ -69,6 +91,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ name: ''
},
total: 0,
dataList: [],
@@ -116,7 +139,12 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ name: ''
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/questionBankManagement/index.vue b/src/views/onlineEducation/questionBankManagement/index.vue
index 27ede7f..2371948 100644
--- a/src/views/onlineEducation/questionBankManagement/index.vue
+++ b/src/views/onlineEducation/questionBankManagement/index.vue
@@ -1,12 +1,30 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
+ <el-form-item label="题库名称：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入题库名称"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -51,6 +69,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ name: ''
},
total: 0,
dataList: [],
@@ -92,7 +111,12 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ name: ''
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/questionBankManagement/questionManage/index.vue b/src/views/onlineEducation/questionBankManagement/questionManage/index.vue
index ab257c2..e32b2aa 100644
--- a/src/views/onlineEducation/questionBankManagement/questionManage/index.vue
+++ b/src/views/onlineEducation/questionBankManagement/questionManage/index.vue
@@ -1,7 +1,15 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
+ <div>
<el-form :model="data.queryParams" ref="queryRef" :inline="true" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
<el-form-item label="题型：">
<el-select v-model="data.queryParams.questionType" placeholder="请选择题型" clearable>
<el-option
@@ -44,12 +52,7 @@
<el-button @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="data.dataList" :border="true">
diff --git a/src/views/onlineEducation/systemManage/company/index.vue b/src/views/onlineEducation/systemManage/company/index.vue
index 57153c0..b3ef373 100644
--- a/src/views/onlineEducation/systemManage/company/index.vue
+++ b/src/views/onlineEducation/systemManage/company/index.vue
@@ -1,12 +1,30 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
+ <el-form-item label="企业名称：" >
+ <el-input v-model="data.queryParams.name" placeholder="请输入企业名称"></el-input>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -63,6 +81,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ name: ''
},
total: 0,
dataList: []
@@ -102,7 +121,12 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ name: ''
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
diff --git a/src/views/onlineEducation/systemManage/courseClassification/index.vue b/src/views/onlineEducation/systemManage/courseClassification/index.vue
index 49436e4..a3234ac 100644
--- a/src/views/onlineEducation/systemManage/courseClassification/index.vue
+++ b/src/views/onlineEducation/systemManage/courseClassification/index.vue
@@ -1,16 +1,23 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-form>
- <el-form-item label="分类名称">
- <el-input style="width: 20%" v-model="data.queryParams.name "></el-input>
- <el-button type="primary" style="margin-left: 30px" @click="getList">查询</el-button>
- <el-button plain @click="reset">重置</el-button>
- <el-button type="success" plain @click="openDialog('addFirst',{})">添加</el-button>
+ <div>
+ <el-form style="display: flex;flex-wrap: wrap">
+ <el-form-item>
+ <el-button type="primary" plain @click="openDialog('addFirst',{})" icon="Plus"> 添加</el-button>
</el-form-item>
-
</el-form>
</div>
+<!-- <div style="margin-bottom: 10px">-->
+<!-- <el-form>-->
+<!-- <el-form-item label="分类名称">-->
+<!-- <el-input style="width: 20%" v-model="data.queryParams.name "></el-input>-->
+<!-- <el-button type="primary" style="margin-left: 30px" @click="getList">查询</el-button>-->
+<!-- <el-button plain @click="reset">重置</el-button>-->
+<!-- <el-button type="success" plain @click="openDialog('addFirst',{})">添加</el-button>-->
+<!-- </el-form-item>-->
+
+<!-- </el-form>-->
+<!-- </div>-->
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true" row-key="id">
<el-table-column label="序号" type="index" align="center" width="80" />
diff --git a/src/views/onlineEducation/systemManage/user/index.vue b/src/views/onlineEducation/systemManage/user/index.vue
index 2b62458..4bc7af5 100644
--- a/src/views/onlineEducation/systemManage/user/index.vue
+++ b/src/views/onlineEducation/systemManage/user/index.vue
@@ -1,12 +1,40 @@
<template>
<div class="app-container">
- <div style="margin-bottom: 10px">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="openDialog('add',{})"
- >新增</el-button>
+ <div style="display: flex;justify-content: space-between">
+ <el-form :inline="true" style="display: flex;align-items: center;flex-wrap: wrap;" >
+ <el-form-item>
+ <el-button
+ type="primary"
+ plain
+ icon="Plus"
+ @click="openDialog('add',{})"
+ >新增</el-button>
+ </el-form-item>
+ <el-form-item label="用户名：" >
+ <el-input v-model="data.queryParams.username" placeholder="请输入用户名"></el-input>
+ </el-form-item>
+ <el-form-item label="用户类型：" >
+ <el-select v-model="data.queryParams.userType" placeholder="请选择" clearable>
+ <el-option
+ v-for="item in data.userTypeList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item >
+ <el-button
+ type="primary"
+ @click="getList"
+ >查询</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="reset"
+ >重置</el-button>
+ </el-form-item>
+ </el-form>
</div>
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true">
@@ -52,9 +80,33 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ username: '',
+ userType: null
},
total: 0,
dataList: [],
+ userTypeList: [
+ {
+ id: 0,
+ name: '管理员'
+ },
+ {
+ id: 1,
+ name: '企业级'
+ },
+ {
+ id: 2,
+ name: '部门级'
+ },
+ {
+ id: 3,
+ name: '车间（岗位）级别'
+ },
+ {
+ id: 4,
+ name: '其他'
+ },
+ ]
});
@@ -96,7 +148,13 @@
/** 重置新增的表单以及其他数据 */
function reset() {
- proxy.resetForm("roleRef");
+ data.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ username: '',
+ userType: null
+ }
+ getList()
}
const handleDelete = (val) => {
ElMessageBox.confirm(
--
Gitblit v1.9.2