zs hace 1 año
padre
commit
ceb684467c

+ 53 - 11
src/components/custom/custom-search-bar.vue

@@ -1,16 +1,39 @@
 <template>
   <div id="custom-search-bar">
-    <el-form ref="formRef" :model="form" :label-width="labelWidth" class="form" @submit.prevent :inline="true">
-      <el-form-item v-for="item in fields" :key="`form-field-${item.model}`" :label="getField('label', item)" :prop="item.model" :required="item.required">
+    <el-form
+      ref="formRef"
+      :model="form"
+      :label-width="labelWidth"
+      class="form"
+      @submit.prevent
+      :inline="true"
+    >
+      <el-form-item
+        v-for="item in fields"
+        :key="`form-field-${item.model}`"
+        :label="getField('label', item)"
+        :prop="item.model"
+        :required="item.required"
+      >
         <template v-if="item.custom">
           <slot :name="item.model" v-bind="{ item }"></slot>
         </template>
         <template v-else>
           <template v-if="item.type === 'numbers'">
-            <el-input-number v-model="form[item.model]" :placeholder="getField('placeholder', item)" @change="dataChange(item.model)" style="width: 100%" />
+            <el-input-number
+              v-model="form[item.model]"
+              :placeholder="getField('placeholder', item)"
+              @change="dataChange(item.model)"
+              style="width: 100%"
+            />
           </template>
           <template v-else-if="item.type === 'radio'">
-            <el-radio-group v-model="form[item.model]" :type="item.type" v-bind="item.options" @change="dataChange(item.model)">
+            <el-radio-group
+              v-model="form[item.model]"
+              :type="item.type"
+              v-bind="item.options"
+              @change="dataChange(item.model)"
+            >
               <slot :name="item.model" v-bind="{ item }"></slot>
             </el-radio-group>
           </template>
@@ -51,7 +74,16 @@
               <slot :name="item.model" v-bind="{ item }"></slot>
             </el-select>
           </template>
-          <template v-else-if="item.type === `year` || item.type == 'month' || item.type == 'date' || item.type == 'daterange' || item.type == 'datetime' || item.type == 'datetimerange'">
+          <template
+            v-else-if="
+              item.type === `year` ||
+              item.type == 'month' ||
+              item.type == 'date' ||
+              item.type == 'daterange' ||
+              item.type == 'datetime' ||
+              item.type == 'datetimerange'
+            "
+          >
             <el-date-picker
               v-model="form[item.model]"
               :type="item.type"
@@ -78,7 +110,13 @@
             </el-time-picker>
           </template>
           <template v-else-if="item.type === `inputnumber`">
-            <el-input-number v-model="form[item.model]" :placeholder="getField('placeholder', item)" v-bind="item.options" @change="dataChange(item.model)" style="width: 100%"></el-input-number>
+            <el-input-number
+              v-model="form[item.model]"
+              :placeholder="getField('placeholder', item)"
+              v-bind="item.options"
+              @change="dataChange(item.model)"
+              style="width: 100%"
+            ></el-input-number>
           </template>
           <template v-else>
             <el-input
@@ -93,11 +131,11 @@
           </template>
         </template>
       </el-form-item>
-      <el-form-item v-if="fields.length > 0">
-        <el-button type="primary" @click="toClick">{{ $t('common.search') }}</el-button>
-        <el-button type="default" @click="toReset">{{ $t('common.reset') }}</el-button>
-      </el-form-item>
     </el-form>
+    <el-col :span="24" class="button" v-if="fields.length > 0">
+      <el-button type="primary" @click="toClick">{{ $t('common.search') }}</el-button>
+      <el-button type="default" @click="toReset">{{ $t('common.reset') }}</el-button>
+    </el-col>
   </div>
 </template>
 
@@ -147,4 +185,8 @@ const getDateFormat = (e) => {
   if (e === 'time') return 'HH:mm:ss'
 }
 </script>
-<style scoped></style>
+<style scoped>
+.button {
+  text-align: right;
+}
+</style>

+ 1 - 1
src/components/custom/custom-table.vue

@@ -110,7 +110,7 @@ const changePage = (page = currentPage.value) => {
 </script>
 <style scoped>
 .el-row {
-  padding-top: 20px;
+  padding-top: 15px;
 }
 .link {
   padding: 0 5px 0 0;

+ 16 - 31
src/lang/package/zh-cn/pages.js

@@ -1,5 +1,3 @@
-import { status } from 'nprogress'
-
 export default {
   menus: {
     dialogTitle: '菜单信息',
@@ -130,35 +128,6 @@ export default {
     agreement: '用户协议',
     brief: '关于我们'
   },
-  video: {
-    addDialogTitle: '新增视频',
-    upDialogTitle: '修改视频',
-    examDialogTitle: '审核视频',
-    title: '标题',
-    sourse: '来源',
-    time: '发布时间',
-    number: '浏览次数',
-    content: '内容',
-    type: '类型',
-    logo: '封面',
-    file: '视频',
-    brief: '简介',
-    is_use: '是否启用',
-    status: '审核状态',
-    titleMessage: '请输入标题',
-    typeMessage: '请选择类型',
-    fileMessage: '请上传视频',
-    sourseMessage: '请输入来源',
-    logoMessage: '请上传封面',
-    isUseMessage: '请选择是否使用'
-  },
-  record: {
-    user_name: '用户名称',
-    video_name: '视频名称',
-    time: '观看时长(秒)',
-    start_time: '开始时间',
-    end_time: '结束时间'
-  },
   opinion: {
     user_name: '用户名称',
     userType: '用户类型',
@@ -167,5 +136,21 @@ export default {
     file: '图片',
     time: '时间',
     status: '状态'
+  },
+  course: {
+    dialogTitle: '课程信息',
+    examDialogTitle: '课程审核',
+    teacher_name: '老师昵称',
+    teacher_phone: '老师电话',
+    name: '课程名称',
+    subject: '学科',
+    grade: '年级',
+    money: '金额(元)',
+    start_time: '开始时间',
+    end_time: '结束时间',
+    type: '类型',
+    brief: '简介',
+    status: '状态',
+    is_show: '是否公开'
   }
 }

+ 9 - 0
src/store/api/core/course.js

@@ -13,6 +13,14 @@ export const CourseStore = defineStore('course', () => {
     const res = await axios.$get(`${url}`, cond)
     return res
   }
+  const list = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`${url}/list`, cond)
+    return res
+  }
   const fetch = async (payload) => {
     const res = await axios.$get(`${url}/${payload}`)
     return res
@@ -32,6 +40,7 @@ export const CourseStore = defineStore('course', () => {
   }
   return {
     query,
+    list,
     fetch,
     create,
     update,

+ 181 - 9
src/views/core/course/index.vue

@@ -1,47 +1,219 @@
 <template>
   <div class="main animate__animated animate__backInRight" v-loading="loading">
-    <custom-search-bar :fields="fields.filter((f) => f.isSearch)" v-model="searchForm" @search="search" @reset="toReset"></custom-search-bar>
-    <custom-table :data="data" :fields="fields" @query="search" :total="total" :opera="opera"></custom-table>
+    <custom-search-bar :fields="fields.filter((f) => f.isSearch)" v-model="searchForm" @search="search" @reset="toReset">
+      <template #type>
+        <el-option v-for="i in typeList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+      </template>
+      <template #status>
+        <el-option v-for="i in statusList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+      </template>
+      <template #subject>
+        <el-option v-for="i in subjectList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+      </template>
+      <template #grade>
+        <el-option v-for="i in gradeList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+      </template>
+    </custom-search-bar>
+    <custom-table :data="data" :fields="fields" @query="search" :total="total" :opera="opera" @view="toView" @exam="toExam"  @delete="toDelete">
+      <template #status="{ row }">
+        <el-tag v-if="row.status == '1'" type="success">已解决</el-tag>
+        <el-tag v-else type="info">未解决</el-tag>
+      </template>
+    </custom-table>
+    <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
+      <el-row>
+        <el-col :span="24" v-if="dialog.type == '1'">
+          <custom-form v-model="form" :fields="formFields" @save="toSave">
+            <template #status>
+              <el-option v-for="i in statusList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+            </template>
+            <template #type>
+              <el-option disabled v-for="i in typeList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+            </template>
+            <template #subject>
+              <el-option disabled v-for="i in subjectList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+            </template>
+            <template #grade>
+              <el-option disabled v-for="i in gradeList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+            </template>
+            <template #is_show>
+              <el-option v-for="i in showList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+            </template>
+          </custom-form>
+        </el-col>
+        <el-col :span="24" v-if="dialog.type == '2'">
+          <custom-form v-model="examForm" :fields="examFormFields" :rules="examRules" @save="toExamSave">
+            <template #status>
+              <el-option v-for="i in statusList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+            </template>
+          </custom-form>
+        </el-col>
+      </el-row>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import { cloneDeep, get } from 'lodash-es'
 const { t } = useI18n()
+const $checkRes = inject('$checkRes')
 // 接口
 import { CourseStore } from '@/store/api/core/course'
+import { DictDataStore } from '@/store/api/system/dictData'
+const dictDataStore = DictDataStore()
 const store = CourseStore()
 const data = ref([])
 const searchForm = ref({})
 const fields = [
-  { label: t('pages.record.user_name'), model: 'user_name', isSearch: true },
-  { label: t('pages.record.video_name'), model: 'video_name' },
-  { label: t('pages.record.time'), model: 'time', type: 'date' },
-  { label: t('pages.record.start_time'), model: 'start_time' },
-  { label: t('pages.record.end_time'), model: 'end_time' }
+  { label: t('pages.course.teacher_name'), model: 'teacher_name' },
+  { label: t('pages.course.teacher_phone'), model: 'teacher_phone' },
+  { label: t('pages.course.name'), model: 'name', isSearch: true },
+  { label: t('pages.course.money'), model: 'money' },
+  { label: t('pages.course.subject'), model: 'subject', format: (i) => getDict(i, 'subject'), type: 'select', isSearch: true },
+  { label: t('pages.course.grade'), model: 'grade', format: (i) => getDict(i, 'grade'), type: 'select', isSearch: true },
+  { label: t('pages.course.type'), model: 'type', format: (i) => getDict(i, 'type'), type: 'select', isSearch: true },
+  { label: t('pages.course.start_time'), model: 'start_time', type: 'datetime' },
+  { label: t('pages.course.end_time'), model: 'end_time', type: 'datetime' },
+  { label: t('pages.course.status'), model: 'status', format: (i) => getDict(i, 'status'), type: 'select', isSearch: true }
 ]
 let skip = 0
 let limit = inject('limit')
 const total = ref(0)
+const opera = [
+  { label: t('common.view'), method: 'view' },
+  { label: t('common.exam'), method: 'exam', type: 'warning', display: (i) => i.status === '0' },
+  {
+    label: t('common.delete'),
+    method: 'delete',
+    confirm: true,
+    type: 'danger'
+  }
+]
+const dialog = ref({ type: '1', show: false, title: t('pages.course.addDialogTitle') })
+const form = ref({})
+const formFields = [
+  { label: t('pages.course.teacher_name'), model: 'teacher_name', options: { readonly: true } },
+  { label: t('pages.course.teacher_phone'), model: 'teacher_phone', options: { readonly: true } },
+  { label: t('pages.course.name'), model: 'name', options: { readonly: true } },
+  { label: t('pages.course.subject'), model: 'subject', type: 'select' },
+  { label: t('pages.course.grade'), model: 'grade', type: 'select' },
+  { label: t('pages.course.type'), model: 'type', type: 'select' },
+  { label: t('pages.course.money'), model: 'money', options: { readonly: true } },
+  { label: t('pages.course.start_time'), model: 'start_time', options: { readonly: true } },
+  { label: t('pages.course.end_time'), model: 'end_time', options: { readonly: true } },
+  { label: t('pages.course.brief'), model: 'brief', type: 'textarea', options: { readonly: true } },
+  { label: t('pages.course.is_show'), model: 'is_show', type: 'select' }
+]
+// 审核
+const examFormFields = [{ label: t('pages.teacher.status'), model: 'status', type: 'select' }]
+const examRules = reactive({
+  status: [{ required: true, message: t('common.statusMessage'), trigger: 'blur' }]
+})
+const examForm = ref({})
 // 加载中
 const loading = ref(false)
+// 字典表
+const statusList = ref([])
+const typeList = ref([])
+const gradeList = ref([])
+const showList = ref([])
+const subjectList = ref([])
 // 请求
 onMounted(async () => {
   loading.value = true
+  await searchOther()
   await search({ skip, limit })
   loading.value = false
 })
+const searchOther = async () => {
+  let result
+  // 类型
+  result = await dictDataStore.query({ code: 'courseType', is_use: '0' })
+  if ($checkRes(result)) typeList.value = result.data
+  // 状态
+  result = await dictDataStore.query({ code: 'courseStatus', is_use: '0' })
+  if ($checkRes(result)) statusList.value = result.data
+  // 学科
+  result = await dictDataStore.query({ code: 'subject', is_use: '0' })
+  if ($checkRes(result)) subjectList.value = result.data
+  // 年级
+  result = await dictDataStore.query({ code: 'grade', is_use: '0' })
+  if ($checkRes(result)) gradeList.value = result.data
+  // 是否公开
+  result = await dictDataStore.query({ code: 'show', is_use: '0' })
+  if ($checkRes(result)) showList.value = result.data
+}
 const search = async (query = { skip: 0, limit }) => {
   const info = { skip: query.skip, limit: query.limit, ...searchForm.value }
-  const res = await store.query(info)
+  const res = await store.list(info)
   if (res.errcode == '0') {
     data.value = res.data
     total.value = res.total
   }
 }
+// 字典数据转换
+const getDict = (data, model) => {
+  let res
+  if (model == 'subject') res = subjectList.value.find((f) => f.value == data)
+  else if (model == 'type') res = typeList.value.find((f) => f.value == data)
+  else if (model == 'status') res = statusList.value.find((f) => f.value == data)
+  else if (model == 'grade') res = gradeList.value.find((f) => f.value == data)
+  else if (model == 'is_show') res = showList.value.find((f) => f.value == data)
+  return get(res, 'label')
+}
+// 查看
+const toView = (data) => {
+  form.value = data
+  dialog.value = { type: '1', show: true, title: t('pages.course.dialogTitle') }
+}
+// 审核
+const toExam = (data) => {
+  examForm.value = data
+  dialog.value = { type: '2', show: true, title: t('pages.course.examDialogTitle') }
+}
+// 审核保存
+const toExamSave = async () => {
+  const data = cloneDeep(examForm.value)
+  delete data.teacher_name
+  delete data.teacher_phone
+  let res = await store.update(data)
+  if ($checkRes(res, true)) {
+    search({ skip: 0, limit })
+    toClose()
+  }
+}
+// 删除
+const toDelete = async (data) => {
+  const res = await store.del(data._id)
+  if ($checkRes(res, true)) {
+    search({ skip: 0, limit })
+  }
+}
 // 重置
 const toReset = async () => {
   searchForm.value = {}
   await search({ skip, limit })
 }
+const toClose = () => {
+  form.value = {}
+  dialog.value = { show: false }
+}
+// 保存
+const toSave = async () => {
+  const data = cloneDeep(form.value)
+  delete data.teacher_name
+  delete data.teacher_phone
+  let res = await store.update(data)
+  if ($checkRes(res, true)) {
+    search({ skip: 0, limit })
+    toClose()
+  }
+}
 </script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.images {
+  width: 100px;
+  height: 100px;
+  margin: 0 1vw 0 0;
+}
+</style>

+ 1 - 1
src/views/core/opinion/index.vue

@@ -115,7 +115,7 @@ const getDict = (data, model) => {
   else if (model == 'userType') res = userTypeList.value.find((f) => f.value == data)
   return get(res, 'label')
 }
-// 修改
+// 查看
 const toView = (data) => {
   form.value = data
   dialog.value = { type: '1', show: true, title: t('pages.video.upDialogTitle') }

+ 1 - 1
src/views/system/menus/index.vue

@@ -2,7 +2,7 @@
   <div class="main animate__animated animate__backInRight">
     <el-row>
       <el-col :span="24" style="text-align: right; padding: 10px">
-        <el-button type="primary" size="small" @click="toAdd()">{{ $t('common.add') }}</el-button>
+        <el-button type="primary" size="mini" @click="toAdd()">{{ $t('common.add') }}</el-button>
       </el-col>
       <el-col :span="24">
         <menu-table></menu-table>

+ 0 - 9
src/views/user/teacher/index.vue

@@ -157,15 +157,6 @@ const searchOther = async () => {
   // 学业状态
   result = await dictDataStore.query({ code: 'learnStatus', is_use: '0' })
   if ($checkRes(result)) learnStatusList.value = result.data
-  // 年级
-  result = await dictDataStore.query({ code: 'grade', is_use: '0' })
-  if ($checkRes(result)) gradeList.value = result.data
-  // 身份证类型
-  result = await dictDataStore.query({ code: 'cardType', is_use: '0' })
-  if ($checkRes(result)) cardTypeList.value = result.data
-  // 学科
-  result = await dictDataStore.query({ code: 'subject', is_use: '0' })
-  if ($checkRes(result)) subjectList.value = result.data
   // 是否公开
   result = await dictDataStore.query({ code: 'show', is_use: '0' })
   if ($checkRes(result)) showList.value = result.data