zs 1 рік тому
батько
коміт
e0d5b9f9e9

+ 11 - 1
src/lang/package/zh-cn/pages.js

@@ -1,3 +1,5 @@
+import { status } from 'nprogress'
+
 export default {
   menus: {
     dialogTitle: '菜单信息',
@@ -61,7 +63,6 @@ export default {
     gender: '性别',
     age: '年龄',
     grade: '所属年级',
-    years: '任课年限',
     cardType: '身份证类型',
     card: '身份证号码',
     education: '学历',
@@ -162,5 +163,14 @@ export default {
     time: '观看时长(秒)',
     start_time: '开始时间',
     end_time: '结束时间'
+  },
+  opinion: {
+    user_name: '用户名称',
+    userType: '用户类型',
+    type: '问题类型',
+    brief: '问题描述',
+    file: '图片',
+    time: '时间',
+    status: '状态'
   }
 }

+ 102 - 8
src/views/core/opinion/index.vue

@@ -1,35 +1,97 @@
 <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 #userType>
+        <el-option v-for="i in userTypeList" :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"></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 #file>
+              <el-image class="images" v-for="i in form.file" :key="i.id" :src="i.url" :preview-src-list="getFlie(form.file)"></el-image>
+            </template>
+            <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 #userType>
+              <el-option disabled v-for="i in userTypeList" :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 { get } from 'lodash-es'
 const { t } = useI18n()
+const $checkRes = inject('$checkRes')
 // 接口
 import { OpinionStore } from '@/store/api/core/opinion'
+import { DictDataStore } from '@/store/api/system/dictData'
+const dictDataStore = DictDataStore()
 const store = OpinionStore()
 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', isSearch: true },
-  { 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.opinion.user_name'), model: 'user_name', isSearch: true },
+  { label: t('pages.opinion.userType'), model: 'userType', format: (i) => getDict(i, 'userType'), type: 'select', isSearch: true },
+  { label: t('pages.opinion.type'), model: 'type', format: (i) => getDict(i, 'type'), type: 'select', isSearch: true },
+  { label: t('pages.opinion.time'), model: 'time', type: 'date' },
+  { label: t('pages.opinion.status'), model: 'status', format: (i) => getDict(i, 'status'), type: 'select' }
 ]
 let skip = 0
 let limit = inject('limit')
 const total = ref(0)
+const opera = [{ label: t('common.view'), method: 'view' }]
+const dialog = ref({ type: '1', show: false, title: t('pages.video.addDialogTitle') })
+const form = ref({})
+const formFields = [
+  { label: t('pages.opinion.user_name'), model: 'user_name', options: { readonly: true } },
+  { label: t('pages.opinion.type'), model: 'type', type: 'select' },
+  { label: t('pages.opinion.time'), model: 'time', type: 'date', options: { readonly: true } },
+  { label: t('pages.opinion.brief'), model: 'brief', type: 'textarea', options: { readonly: true } },
+  { label: t('pages.opinion.file'), model: 'file', custom: true },
+  { label: t('pages.opinion.status'), model: 'status', type: 'select' }
+]
 // 加载中
 const loading = ref(false)
+// 字典表
+const statusList = ref([])
+const typeList = ref([])
+const userTypeList = 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: 'opinionType', is_use: '0' })
+  if ($checkRes(result)) typeList.value = result.data
+  // 状态
+  result = await dictDataStore.query({ code: 'opinionStatus', is_use: '0' })
+  if ($checkRes(result)) statusList.value = result.data
+  // 用户类型
+  result = await dictDataStore.query({ code: 'role', is_use: '0' })
+  if ($checkRes(result)) userTypeList.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)
@@ -38,10 +100,42 @@ const search = async (query = { skip: 0, limit }) => {
     total.value = res.total
   }
 }
+// 字典数据转换
+const getDict = (data, model) => {
+  let res
+  if (model == 'status') res = statusList.value.find((f) => f.value == data)
+  else if (model == 'type') res = typeList.value.find((f) => f.value == data)
+  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') }
+}
 // 重置
 const toReset = async () => {
   searchForm.value = {}
   await search({ skip, limit })
 }
+// 图片处理
+const getFlie = (file) => {
+  if (file && file.length > 0) {
+    const urls = file.map((i) => {
+      return i.url
+    })
+    return urls
+  }
+}
+const toClose = () => {
+  form.value = {}
+  dialog.value = { show: false }
+}
 </script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.images {
+  width: 100px;
+  height: 100px;
+  margin: 0 1vw 0 0;
+}
+</style>

+ 8 - 8
src/views/user/student/parts/user.vue

@@ -18,14 +18,14 @@
 const { t } = useI18n()
 const form = inject('form')
 const formFields = ref([
-  { label: t('pages.teacher.icon'), model: 'icon', custom: true },
-  { label: t('pages.teacher.opneid'), model: 'opneid' },
-  { label: t('pages.teacher.nick_name'), model: 'nick_name' },
-  { label: t('pages.teacher.gender'), model: 'gender', type: 'select' },
-  { label: t('pages.teacher.age'), model: 'age' },
-  { label: t('pages.teacher.phone'), model: 'phone' },
-  { label: t('pages.teacher.grade'), model: 'grade', type: 'select' },
-  { label: t('pages.teacher.address'), model: 'address' }
+  { label: t('pages.student.icon'), model: 'icon', custom: true },
+  { label: t('pages.student.openid'), model: 'openid' },
+  { label: t('pages.student.nick_name'), model: 'nick_name' },
+  { label: t('pages.student.gender'), model: 'gender', type: 'select' },
+  { label: t('pages.student.age'), model: 'age' },
+  { label: t('pages.student.phone'), model: 'phone' },
+  { label: t('pages.student.grade'), model: 'grade', type: 'select' },
+  { label: t('pages.student.address'), model: 'address', type: 'textarea' }
 ])
 // 字典表
 const genderList = inject('genderList')

+ 1 - 1
src/views/user/teacher/index.vue

@@ -167,7 +167,7 @@ const searchOther = async () => {
   result = await dictDataStore.query({ code: 'subject', is_use: '0' })
   if ($checkRes(result)) subjectList.value = result.data
   // 是否公开
-  result = await dictDataStore.query({ code: 'isUse', is_use: '0' })
+  result = await dictDataStore.query({ code: 'show', is_use: '0' })
   if ($checkRes(result)) showList.value = result.data
 }
 

+ 0 - 1
src/views/user/teacher/parts/user.vue

@@ -75,7 +75,6 @@ const formFields = ref([
   { label: t('pages.teacher.grade'), model: 'grade', type: 'select' },
   { label: t('pages.teacher.cardType'), model: 'cardType', type: 'select' },
   { label: t('pages.teacher.card'), model: 'card' },
-  { label: t('pages.teacher.years'), model: 'years' },
   { label: t('pages.teacher.education'), model: 'education', type: 'select' },
   { label: t('pages.teacher.subject'), model: 'subject', type: 'select' },
   { label: t('pages.teacher.college'), model: 'college' },