From cfe0fd3394a38fa51a92154a14cac2b7d250ddc6 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Mon, 15 Jul 2024 18:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=20=20=E6=9F=A5=E6=89=BE=E5=AF=B9=E5=BA=94=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/file-image/index.vue        | 15 ++++-----------
 .../src/components/upload-dialog/index.vue     | 18 ++++++++++--------
 .../views/resource/container/resoure-list.vue  | 14 ++++++++------
 src/renderer/src/views/resource/store.js       |  8 ++++----
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/renderer/src/components/file-image/index.vue b/src/renderer/src/components/file-image/index.vue
index 768bd7e..3cc460b 100644
--- a/src/renderer/src/components/file-image/index.vue
+++ b/src/renderer/src/components/file-image/index.vue
@@ -1,11 +1,11 @@
 <template>
   <svg class="icon file-icon" aria-hidden="true" :style="{'font-size': size + 'px'}">
-    <use :xlink:href="getFileTypeIcon"></use>
+    <use :xlink:href="getFileTypeIcon()"></use>
   </svg>
 </template>
 
 <script setup>
-import { watch, defineProps } from 'vue'
+import { defineProps } from 'vue'
 
 const props = defineProps({
   fileName: {
@@ -17,17 +17,10 @@ const props = defineProps({
     default: '30'
   }
 })
-console.log(1000)
 
-watch (() => props.fileName, (newVal, oldVal) => {
-  console.log(newVal,oldVal)
-  getFileTypeIcon(newVal)
- 
-})
 
-const getFileTypeIcon = (fileName) => {
-  console.log(props.fileName)
-  const name = fileName.substr(fileName.lastIndexOf('.') + 1);
+const getFileTypeIcon = () => {
+  const name = props.fileName.substr(props.fileName.lastIndexOf('.') + 1);
   const iconObj = {
     pdf: 'icon-pdf',
     ppt: 'icon-ppt',
diff --git a/src/renderer/src/components/upload-dialog/index.vue b/src/renderer/src/components/upload-dialog/index.vue
index d171943..96dd952 100644
--- a/src/renderer/src/components/upload-dialog/index.vue
+++ b/src/renderer/src/components/upload-dialog/index.vue
@@ -16,7 +16,7 @@
             <div class="file-list-item flex" v-for="(item, index) in fileList" :key="item.uid">
               <div class="file-name">
                 <span class="name">标题：</span>
-                <!-- <FileImage fileName="item.name" /> -->
+                <FileImage :fileName="item.name" />
                 <span class="text">{{ item.name }}</span>
               </div>
               <div class="flex-type flex">
@@ -64,16 +64,18 @@ const fileType = ref(1)
 // 资源类型
 const resourceType = ref([
   {
-    label: '课件',
-    value: 1
+    text: '素材',
+    value: '素材'
   },
+
   {
-    label: '教案',
-    value: 2
+    text: '课件',
+    value: '课件'
   },
+
   {
-    label: '素材',
-    value: 3
+    text: '教案',
+    value: '教案'
   }
 ])
 
@@ -112,7 +114,7 @@ const hanleFileChange = (file) => {
   if (file.status === 'ready') {
     // 给一个默认的fileData
     file.fileData = {
-      fileFlag: 1
+      fileFlag: '课件'
     }
     fileList.value.push(file)
   }
diff --git a/src/renderer/src/views/resource/container/resoure-list.vue b/src/renderer/src/views/resource/container/resoure-list.vue
index c23b50f..5d94c40 100644
--- a/src/renderer/src/views/resource/container/resoure-list.vue
+++ b/src/renderer/src/views/resource/container/resoure-list.vue
@@ -5,9 +5,7 @@
       <ul>
         <li class="list-item" v-for="item in sourceStore.result.list" :key="item.id">
           <div class="item-left flex">
-            <svg class="icon icon-ppt" aria-hidden="true">
-              <use xlink:href="#icon-ppt"></use>
-            </svg>
+            <FileImage :fileName="item.fileName" :size="50"/>
             <div class="flex item-left-content">
               <div class="name flex">{{ item.fileName }}</div>
               <div class="item-tags flex">
@@ -48,18 +46,21 @@
           </div>
         </li>
       </ul>
-      <div class="pagination-box">
+     
+    </el-scrollbar>
+    <div class="pagination-box">
         <el-pagination v-model:current-page="sourceStore.query.pageNum" v-model:page-size="sourceStore.query.pageSize"
-          hide-on-single-page :page-sizes="[10, 20, 30, 50]" background layout="total, sizes, prev, pager, next, jumper"
+         :page-sizes="[10, 20, 30, 50]" background layout="total, sizes, prev, pager, next, jumper"
           :total="sourceStore.result.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
-    </el-scrollbar>
   </div>
 </template>
 
 <script setup>
 
 import useResoureStore from '../store'
+import FileImage from '@/components/file-image/index.vue'
+
 const sourceStore = useResoureStore()
 
 
@@ -98,6 +99,7 @@ const handleCurrentChange = () => { }
 
 .resource-list {
   .list-item {
+    flex: 1;
     padding: 10px 20px;
     border-bottom: solid #f1f1f1 1px;
     display: flex;
diff --git a/src/renderer/src/views/resource/store.js b/src/renderer/src/views/resource/store.js
index bef7001..adc7318 100644
--- a/src/renderer/src/views/resource/store.js
+++ b/src/renderer/src/views/resource/store.js
@@ -15,7 +15,7 @@ const tabs = [
 const typeList = [
   {
     text: '全部',
-    value: '全部'
+    value: ''
   },
   {
     text: '素材',
@@ -36,7 +36,7 @@ const typeList = [
 const formatList = [
   {
     label: '资源格式',
-    value: '全部'
+    value: ''
   },
   {
     label: 'word',
@@ -75,8 +75,8 @@ export default defineStore('resource', {
     //查询条件
     query: {
       fileSource: '平台',
-      fileSuffix: '全部',
-      fileFlag: '全部',
+      fileSuffix: '',
+      fileFlag: '',
       fileRoot: '资源',
       orderByColumn: 'uploadTime',
       isAsc: 'desc',