From ca9a92cfc2f2bd8c724020ee5e46094633eb80a5 Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期五, 12 七月 2024 17:39:45 +0800
Subject: [PATCH] 处理冲突
---
src/views/folder/index.vue | 132 ++++++++++++++++++++++++++++++++++---------
1 files changed, 103 insertions(+), 29 deletions(-)
diff --git a/src/views/folder/index.vue b/src/views/folder/index.vue
index 8af363c..8f97afd 100644
--- a/src/views/folder/index.vue
+++ b/src/views/folder/index.vue
@@ -9,7 +9,18 @@
<div class="card-wrapper w-full h-full flex flex-col px-8 box-border">
<div class="card-header flex justify-between items-center shrink-0">
<div class="header-search flex items-center">
- <el-input v-model="searchText" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" :prefix-icon="Search" maxlength="20" />
+ <el-input v-model="searchText" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" class="long-input" :prefix-icon="Search"/>
+ <el-select v-model="searchSubject" placeholder="璇烽�夋嫨绉戠洰" class="ml-4 long-select" clearable>
+ <el-option v-for="item in subjectList" :key="item.id" :label="item.name" :value="item.id"/>
+ </el-select>
+ <el-select v-model="searchContentType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" class="ml-4 long-select" clearable>
+ <el-option
+ v-for="item in contentTypeList"
+ :key="item.value"
+ :label="item.name"
+ :value="item.value">
+ </el-option>
+ </el-select>
<el-button type="primary" class="ml-4" @click="searchFile">鎼滅储</el-button>
</div>
</div>
@@ -21,15 +32,15 @@
<template #default="scope">
<div class="row-info">
<div class="icon">
- <img :src="getIcon(scope.row.contentType)" class="width-img" />
+ <img :src="getIcon(scope.row.contentType)" class="width-img"/>
</div>
<div class="label">{{ scope.row.introduction }}</div>
</div>
</template>
</el-table-column>
- <el-table-column prop="className" label="鐝骇" align="center" />
- <el-table-column prop="typeName" label="绉戠洰" align="center" />
- <el-table-column prop="updateTime" label="涓婁紶鏃堕棿" align="center" />
+ <el-table-column prop="className" label="鐝骇" align="center"/>
+ <el-table-column prop="typeName" label="绉戠洰" align="center"/>
+ <el-table-column prop="updateTime" label="涓婁紶鏃堕棿" align="center"/>
<el-table-column>
<template #default="scope">
<el-button link type="primary" @click.prevent="checkRow(scope.row)">
@@ -42,11 +53,11 @@
</div>
<div class="card-footer flex justify-center mb-7 shrink-0">
- <el-pagination background layout="prev, pager, next" :total="fileList.length"
- :default-page-size="20"
- :currentPage="currentIndex"
- :hide-on-single-page="true"
- @current-change="handleCurrentChange" />
+ <el-pagination background layout="prev, pager, next" :total="fileList.length"
+ :default-page-size="20"
+ :currentPage="currentIndex"
+ :hide-on-single-page="true"
+ @current-change="handleCurrentChange"/>
</div>
</div>
</el-card>
@@ -61,7 +72,7 @@
<el-button type="danger" size="large" circle @click="closeViewer">
<template #icon>
<el-icon :size="18">
- <Close />
+ <Close/>
</el-icon>
</template>
</el-button>
@@ -74,29 +85,41 @@
</div>
<!-- 瑙嗛鏌ョ湅 -->
- <div class="video-container">
-
+ <div class="video-container" v-show="videoViewer">
+ <VideoViewer :videoUrl="videoUrl"></VideoViewer>
+ <div class="close-btn">
+ <el-button type="danger" size="large" circle @click="closeViewer">
+ <template #icon>
+ <el-icon :size="20">
+ <Close/>
+ </el-icon>
+ </template>
+ </el-button>
+ </div>
</div>
</div>
</template>
<script setup>
-import { ref, onMounted, onBeforeUnmount } from 'vue';
-import { storeToRefs } from 'pinia';
-import { Close } from '@element-plus/icons-vue';
+import {ref, onMounted, onBeforeUnmount} from 'vue';
+import {storeToRefs} from 'pinia';
+import {Close} from '@element-plus/icons-vue';
import NormalHeader from '@/components/NormalHeader/index.vue';
-import { Search } from '@element-plus/icons-vue';
-import { getFileList } from '@/api/modules/file.js';
+import {Search} from '@element-plus/icons-vue';
+import {getFileList} from '@/api/modules/file.js';
+import {getSubjectList} from '@/api/modules/subject.js';
import PDFViewer from '@/components/PDFViewer/index.vue';
-import { useUserStore } from '@/store/index.js';
+import VideoViewer from '@/components/VideoViewer/index.vue';
+
+import {useUserStore} from '@/store/index.js';
import useWebScoket from '@/hooks/useWebScoket.js';
const userStore = useUserStore();
-const { userInfo } = storeToRefs(userStore);
-const { status, message, error, connect, disconnect, sendMessage } = useWebScoket({
- url: 'ws://192.168.3.64:8000/websocket/' + userInfo.value.id,
+const {userInfo} = storeToRefs(userStore);
+const {status, message, error, connect, disconnect, sendMessage} = useWebScoket({
+ url: 'ws://42.193.1.25:8000/websocket/' + userInfo.value.id,
heartBeatData: 'ping'
});
@@ -109,7 +132,7 @@
handle: (item) => {
console.log(item);
imageViewer.value = true;
- imageList.value = [item.contentUrl.url];
+ imageList.value = ['/api/files/' + item.contentUrl.url];
resendMessage();
}
},
@@ -117,6 +140,8 @@
iconPath: '/static/icons/file_type_video.png',
handle: (item) => {
console.log(item);
+ videoViewer.value = true;
+ videoUrl.value = ['/api/files/' + item.contentUrl.url];
resendMessage();
}
},
@@ -125,12 +150,14 @@
handle: (item) => {
console.log(item);
pdfViewer.value = true;
- pdfFile.value = item.contentUrl.url;
+ pdfFile.value = '/api/files/' + item.contentUrl.url;
resendMessage();
}
},
};
const searchText = ref('');
+const searchSubject = ref('')
+const searchContentType = ref('')
const loading = ref(false);
@@ -140,9 +167,17 @@
const imageList = ref([]);
const pdfFile = ref('');
+const videoUrl = ref('');
const fileList = ref([]);
-
+const subjectList = ref([]);
+const contentTypeList = ref([{ name: '瑙嗛', value: 'video' },
+ { name: '鍥剧墖', value: 'img' },
+ { name: '闊抽', value: 'audio' },
+ { name: 'PDF', value: 'pdf' },
+ { name: 'EXCEL', value: 'excel' },
+ { name: 'WORD', value: 'word' },
+ { name: 'PPT', value: 'ppt' }]);
const currentIndex = ref(1);
@@ -159,7 +194,7 @@
const getData = () => {
loading.value = true;
- getFileList().then(res => {
+ getFileList({introduction: searchText.value, subjectId: searchSubject.value, contentType:searchContentType.value}).then(res => {
loading.value = false;
fileList.value = res.data;
}).catch(() => {
@@ -168,13 +203,23 @@
};
getData();
+const getSubject = () => {
+ loading.value = true;
+ getSubjectList().then(res => {
+ loading.value = false;
+ subjectList.value = res.data;
+ }).catch(() => {
+ loading.value = false;
+ });
+};
+getSubject();
const resendMessage = () => {
if (time.value) {
clearInterval(time.value);
}
- sendMessage({ id: userInfo.value.id, command: 'recordStudyTime' });
+ sendMessage({id: userInfo.value.id, command: 'recordStudyTime'});
time.value = setInterval(() => {
- sendMessage({ id: userInfo.value.id, command: 'recordStudyTime' });
+ sendMessage({id: userInfo.value.id, command: 'recordStudyTime'});
}, 5000);
};
@@ -218,7 +263,13 @@
margin-right: 20px;
}
}
+.long-input {
+ width: 200px;
+}
+.long-select {
+ width: 200px;
+}
.pdf-container {
width: 100%;
height: 100%;
@@ -241,4 +292,27 @@
}
}
}
-</style>
\ No newline at end of file
+
+.video-container {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ z-index: 99999;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+
+ .close-btn {
+ position: absolute;
+ top: 60px;
+ right: 100px;
+ z-index: 9999999;
+
+ :deep(.el-button) {
+ width: fit-content;
+ height: fit-content;
+ padding: 10px !important;
+ }
+ }
+}
+</style>
--
Gitblit v1.8.0