Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/center-resource

src/components/base/AppList.vue

@@ -70,25 +70,27 @@ const fetchList = (isReset = false) => {
   //   }
   // }
   loading.value = true
-  httpRequest(requestParams)
-    .then((res: any) => {
-      const { list = [], total = 0 } = callback ? callback(res.data) : res.data || {}
-      page.total = total
-      dataList.value = list
-    })
-    // .catch(() => {
-    //   page.total = 0
-    //   dataList.value = []
-    // })
-    .finally(() => {
-      loading.value = false
-    })
+  return (
+    httpRequest(requestParams)
+      .then((res: any) => {
+        const { list = [], total = 0 } = callback ? callback(res.data) : res.data || {}
+        page.total = total
+        dataList.value = list
+      })
+      // .catch(() => {
+      //   page.total = 0
+      //   dataList.value = []
+      // })
+      .finally(() => {
+        loading.value = false
+      })
+  )
 }
 
 // 搜索
 const search = () => {
   page.currentPage = 1
-  fetchList()
+  return fetchList()
 }
 
 // 重置
@@ -98,12 +100,12 @@ const reset = () => {
   // 初始化页码
   page.currentPage = 1
   // 刷新列表
-  fetchList(true)
+  return fetchList(true)
 }
 
 // 刷新
 const refetch = (isForce = false) => {
-  isForce ? reset() : fetchList()
+  return isForce ? reset() : fetchList()
 }
 
 // 页数改变
@@ -117,7 +119,7 @@ onMounted(() => {
   fetchList()
 })
 
-defineExpose({ refetch })
+defineExpose({ refetch, tableRef })
 </script>
 
 <template>

src/modules/admin/category/views/List.vue

@@ -93,25 +93,28 @@ const handleUpdate = () => {
 // 扁平列表数据
 let tableDataList = $ref<ICategory[]>([])
 // 列表配置
-const listOptions = {
-  remote: {
-    httpRequest: getCategoryList,
-    params: { type: 'tree', category_name: '' },
-    callback(data: ICategory[]) {
-      tableData = data
-      tableDataList = flatten(data)
-      return { list: data }
-    }
-  },
-  filters: [{ type: 'input', prop: 'name', label: '类别名称:' }],
-  columns: [
-    { align: 'center', slots: 'table-drag' },
-    { label: '类别名称', prop: 'category_name', align: 'center' },
-    { label: '层级', prop: 'depth', align: 'center' },
-    { label: '状态', prop: 'status_name', align: 'center' },
-    { label: '操作', slots: 'table-operate', width: 230, align: 'center' }
-  ]
-}
+const listOptions = computed(() => {
+  return {
+    remote: {
+      httpRequest: getCategoryList,
+      params: { type: 'tree', category_name: '' },
+      callback(data: ICategory[]) {
+        tableData = data
+        tableDataList = flatten(data)
+        return { list: data }
+      }
+    },
+    filters: [{ type: 'input', prop: 'name', label: '类别名称:' }],
+    columns: [
+      { align: 'center', slots: 'table-drag' },
+      { label: '类别名称', prop: 'category_name', align: 'center' },
+      { label: '层级', prop: 'depth', align: 'center' },
+      { label: '状态', prop: 'status_name', align: 'center' },
+      { label: '操作', slots: 'table-operate', width: 230, align: 'center' }
+    ],
+    data: tableData
+  }
+})
 // 数据扁平化
 function flatten(data: any[], pid = '0') {
   return data.reduce((acc: any[], item: any) => {
@@ -142,23 +145,37 @@ function useSortable() {
     },
     onEnd(evt: SortableEvent) {
       const { oldIndex, newIndex } = evt
-      if (oldIndex === undefined || newIndex === undefined) return
+      if (oldIndex === undefined || newIndex === undefined || oldIndex === newIndex) return
       const draggedRow = tableDataList[oldIndex]
       const relatedRow = tableDataList[newIndex]
-
-      moveCategory({ id: draggedRow.id, brother_id: relatedRow.id, type: 'before' }).then(() => {
+      moveCategory({ id: draggedRow.id, brother_id: relatedRow.id, type: newIndex > oldIndex ? 'after' : 'before' }).then(() => {
+        // 修复拖拽后数据顺序不对的问题
+        if (oldIndex < newIndex) {
+          tableData = []
+        }
         handleUpdate()
       })
     }
   })
 }
+
+// 展开行
+let expandRowKeys = $ref<string[]>([])
+function onExpandChange(row: ICategory, expanded: boolean) {
+  if (expanded) {
+    expandRowKeys.push(row.id)
+  } else {
+    expandRowKeys = expandRowKeys.filter(id => id !== row.id)
+  }
+}
+
 onMounted(() => {
   useSortable()
 })
 </script>
 <template>
   <AppCard title="类别管理">
-    <AppList v-bind="listOptions" :has-pagination="false" row-key="id" ref="appList">
+    <AppList v-bind="listOptions" :has-pagination="false" row-key="id" ref="appList" :expand-row-keys="expandRowKeys" @expand-change="onExpandChange">
       <el-button type="primary" @click="handleAddCategory">新增类别</el-button>
       <template #table-drag>
         <el-icon><Operation /></el-icon>
@@ -170,13 +187,5 @@ onMounted(() => {
       </template>
     </AppList>
   </AppCard>
-  <AddDialog
-    v-model:dialogVisible="dialogVisible"
-    @updatePage="handleUpdate"
-    :editData="editData"
-    :isEdit="isEdit"
-    :title="title"
-    :prevCategoryName="prevCategoryName"
-    v-if="dialogVisible"
-  />
+  <AddDialog v-model:dialogVisible="dialogVisible" @updatePage="handleUpdate" :editData="editData" :isEdit="isEdit" :title="title" :prevCategoryName="prevCategoryName" v-if="dialogVisible" />
 </template>

src/modules/resource/courseware/api.ts

 import httpRequest from '@/utils/axios'
 
-// 获取视频列表
-export function getVideoList(params?: { type?: string; page?: number; page_size?: number }) {
-  return httpRequest.get('/api/psp/backend/video/index', { params })
+// 获取课件列表
+export function getCourseList(params: {
+  tab: string
+  status?: string
+  authorized?: string
+  classification?: string
+  page?: number
+  ['per-page']?: number
+}) {
+  return httpRequest.get('/api/resource/v1/resource/courseware/list', { params })
 }
 
-// 创建视频
-export function createVideo(data: { course_name: string; cover_page: string; type: string; weight?: string }) {
-  return httpRequest.post('/api/psp/backend/video/create', data)
+// 创建
+export function createCourse(data: {
+  url: string
+  name: string
+  source: string
+  classification: string
+  knowledge_points: string
+}) {
+  return httpRequest.post('/api/resource/v1/resource/courseware/create', data)
 }
 
-// 更新视频
-export function updateVideo(data: { id: string; course_name: string; cover_page: string; type: string; weight?: string }) {
-  return httpRequest.post('/api/psp/backend/video/update', data)
+// 获取分类列表
+export function getCategoryList(params: { type: string; category_name?: string }) {
+  return httpRequest.get('/api/resource/v1/backend/category/list', { params })
 }
 
-// 获取视频详情
-export function getVideo(params: { id: string }) {
-  return httpRequest.get('/api/psp/backend/video/view', { params })
+// 更新课件
+export function updateCourse(data: {
+  id: string
+  url: string
+  name: string
+  source: string
+  classification: string
+  knowledge_points: string
+}) {
+  return httpRequest.post('/v1/resource/courseware/update', data)
+}
+// 获取课件详情
+export function getCourseDetails(params: { id: string }) {
+  return httpRequest.get('/api/resource/v1/resource/courseware/view', { params })
 }

src/modules/resource/courseware/index.ts

@@ -7,8 +7,8 @@ export const routes: Array<RouteRecordRaw> = [
     component: AppLayout,
     children: [
       { path: '', component: () => import('./views/List.vue') },
-      { path: 'update', component: () => import('./views/Update.vue') },
-      { path: 'view', component: () => import('./views/View.vue') }
+      { path: '/resource/courseware/update', component: () => import('./views/Update.vue') },
+      { path: '/resource/courseware/view', component: () => import('./views/View.vue') }
       // { path: 'update/:id', component: () => import('./views/Update.vue'), props: true }
     ]
   }

src/modules/resource/courseware/views/List.vue

 <script setup lang="ts">
-// import { getVideoList } from '../api'
+import { getCourseList } from '../api'
 import CardListItem from '@/components/base/CardListItem.vue'
 import { Expand, Search } from '@element-plus/icons-vue'
+import { useMapStore } from '@/stores/map'
+const store = useMapStore()
 
 const appList = ref()
-
+// 列表切换
 const isCard = ref(true)
 
-const listOptions = {
-  remote: {
-    // httpRequest: getVideoList,
-    params: { type: '' },
-    beforeRequest(params: any) {
-      // params.type = 选项卡类型
-      return params
-    }
-  },
-  filters: [
-    { type: 'select', prop: 'type', label: '状态' },
-    { type: 'select', prop: 'project_id', label: '项目' },
-    { type: 'select', prop: 'category_id', label: '类别' },
-    { prop: 'search', slots: 'filter-search' }
-    // { type: 'input', prop: 'category_id', prefixIcon: 'Search' }
-  ],
-  columns: [
-    { label: '视频标题', prop: 'title' },
-    { label: '视频分类', prop: 'type' },
-    { label: '知识点', prop: 'zsd' },
-    { label: '封面', slots: 'table-cover', width: 100 },
-    { label: '资源状态', prop: 'state' },
-    { label: '审核状态', prop: 'state2' },
-    { label: '更新人', prop: 'update' },
-    { label: '更新人部门', prop: 'updatebm' },
-    { label: '更新日期', prop: 'update_time' },
-    { label: '操作', slots: 'table-operate', align: 'right' }
-  ],
-  data: [
-    { id: 1, title: '视频标题', type: '视频分类' },
-    { id: 2, title: '视频标题', type: '视频分类' }
-  ]
+// 资源出处 tab触发
+const tabValue = ref('1')
+const tabChange = () => {
+  appList.value.refetch()
 }
+const listOptions = $computed(() => {
+  return {
+    remote: {
+      httpRequest: getCourseList,
+      params: { tab: tabValue, title: '', status: '', authorized: '', classification: '' },
+      beforeRequest(params: any) {
+        // params.type = 选项卡类型
+        return params
+      }
+    },
+    filters: [
+      {
+        type: 'select',
+        prop: 'type',
+        label: '状态',
+        options: store.mapList?.filter((item: any) => item.key === 'system_status')[0]?.values
+      },
+      { type: 'select', prop: 'project_id', label: '项目' },
+      { type: 'select', prop: 'category_id', label: '类别' },
+      { prop: 'search', slots: 'filter-search' }
+      // { type: 'input', prop: 'category_id', prefixIcon: 'Search' }
+    ],
+    columns: [
+      { label: '课件标题', prop: 'name' },
+      { label: '课件分类', prop: 'classification_name' },
+      { label: '知识点', prop: 'knowledge_points' },
+      { label: '资源状态', prop: 'status_name' },
+      { label: '审核状态', prop: 'audit_status_name' },
+      { label: '更新人', prop: 'updated_operator_name' },
+      { label: '更新人部门', prop: 'organ_id_name' },
+      { label: '更新日期', prop: 'updated_time' },
+      { label: '操作', slots: 'table-operate', align: 'right' }
+    ]
+  }
+})
 </script>
 
 <template>
   <AppCard>
-    <!-- <el-switch v-model="isCard"></el-switch> -->
     <div class="video-head">
-      <el-tabs>
+      <el-tabs @tab-change="tabChange" v-model="tabValue">
         <el-tab-pane label="我的资源"></el-tab-pane>
         <el-tab-pane label="部门资源"></el-tab-pane>
         <el-tab-pane label="公开资源"></el-tab-pane>
@@ -65,10 +73,10 @@ const listOptions = {
       </template>
       <template #table-operate="{ row }">
         <el-space>
-          <router-link :to="`/video/update/${row.id}`">
+          <router-link :to="`/resource/courseware/update/?id=${row.id}`">
             <el-button plain>编辑</el-button>
           </router-link>
-          <router-link :to="`/video/view/${row.id}`">
+          <router-link :to="`/resource/courseware/view/?id=${row.id}`">
             <el-button type="primary" plain>查看</el-button>
           </router-link>
         </el-space>
@@ -76,17 +84,17 @@ const listOptions = {
 
       <!-- 卡片 -->
       <template #body="{ data }" v-if="isCard">
-        <div class="card-list">
+        <div class="card-list" v-if="data.length">
           <CardListItem v-for="(item, index) in data" :data="item" :key="index"></CardListItem>
         </div>
-        <!-- <div class="resource-video-item" v-for="item in data" :key="item.id">{{ item.title }}</div> -->
+        <el-empty v-else description="description" />
       </template>
     </AppList>
   </AppCard>
 </template>
 <style lang="scss">
-.card-list{
-  background: #FAFAFA;
+.card-list {
+  background: #fafafa;
   padding: 20px;
   display: flex;
 }

src/modules/system/dictionary/api.ts

@@ -7,8 +7,8 @@ export function getVideoList(params?: { type?: string; page?: number; page_size?
 // 获取字典列表
 export function getDictionaryList(params?: {
   name?: string
-  key?: number
-  status?: boolean
+  key?: string
+  status?: string
   created_time_start?: string
   created_time_end?: string
   page?: number

src/modules/system/dictionary/views/List.vue

@@ -18,6 +18,7 @@ const listOptions = $computed(() => {
     remote: {
       httpRequest: getDictionaryList,
       params: {
+        status: '',
         type: '',
         created_time_start: '',
         created_time_end: ''