diff --git a/src/style/main.scss b/src/style/main.scss
index 4cec4bf..9fbeccd 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -713,13 +713,26 @@ li {
}
.gva-image {
- width: 120px;
- height: 80px;
- background: #F5F7FA;
+ background: var(--el-fill-color-light);
padding: 6px;
border-radius: 5px;
}
+.gva-media-box {
+ display: flex;
+ background: var(--el-fill-color-light);
+ padding: 6px;
+ border-radius: 5px;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+}
+
+.gva-media-box .el-icon {
+ color: var(--el-text-color-secondary);
+ font-size: 30px;
+}
+
.avatar-uploader .avatar {
width: 100%;
height: 100%;
@@ -751,3 +764,12 @@ li {
margin: 15px;
line-height: 1.5rem;
}
+
+.admin-box .el-table .gva-text-truncate .cell {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ line-height: 1.8rem;
+}
diff --git a/src/view/content/academician/index.vue b/src/view/content/academician/index.vue
index 7f96a8e..4557adc 100644
--- a/src/view/content/academician/index.vue
+++ b/src/view/content/academician/index.vue
@@ -47,9 +47,9 @@
{{ scope.row.title }}
-
+
- {{ scope.row.brief }}
+ {{ scope.row.brief }}
diff --git a/src/view/content/activity/index.vue b/src/view/content/activity/index.vue
index 601e5f1..47ebd9b 100755
--- a/src/view/content/activity/index.vue
+++ b/src/view/content/activity/index.vue
@@ -168,7 +168,6 @@
-
{
activityStatusOptions.value.map((item) => { item.value = parseInt(item.value); return item })
activityKindOptions.value = await getDictFunc('activityKind')
activityKindOptions.value.map((item) => { item.value = parseInt(item.value); return item })
- console.log(activityKindOptions.value)
}
// 获取需要的字典 可能为空 按需保留
setOptions()
-
// 多选数据
const multipleSelection = ref([])
// 多选
diff --git a/src/view/content/article/index.vue b/src/view/content/article/index.vue
index a6a895a..f305b4e 100644
--- a/src/view/content/article/index.vue
+++ b/src/view/content/article/index.vue
@@ -59,11 +59,7 @@
{{ scope.row.subtitle }}
-
-
- {{ scope.row.desc }}
-
-
+
diff --git a/src/view/content/components/academicianEdit.vue b/src/view/content/components/academicianEdit.vue
index afdc0b9..320d124 100644
--- a/src/view/content/components/academicianEdit.vue
+++ b/src/view/content/components/academicianEdit.vue
@@ -41,7 +41,7 @@
-
+
@@ -58,7 +58,7 @@
@@ -71,7 +71,7 @@
上传
@@ -84,7 +84,7 @@
diff --git a/src/view/content/components/entrepreneurEdit.vue b/src/view/content/components/entrepreneurEdit.vue
index 3d3b652..b4dd70f 100644
--- a/src/view/content/components/entrepreneurEdit.vue
+++ b/src/view/content/components/entrepreneurEdit.vue
@@ -41,14 +41,12 @@
-
+
-
+
@@ -60,7 +58,7 @@
@@ -73,7 +71,7 @@
上传
@@ -86,7 +84,7 @@
diff --git a/src/view/content/entrepreneur/index.vue b/src/view/content/entrepreneur/index.vue
index 8979e4a..9d6306f 100644
--- a/src/view/content/entrepreneur/index.vue
+++ b/src/view/content/entrepreneur/index.vue
@@ -47,11 +47,7 @@
{{ scope.row.enterprise }}
-
-
- {{ scope.row.brief }}
-
-
+
编辑
diff --git a/src/view/content/fetcher/article.vue b/src/view/content/fetcher/article.vue
index edc6de9..4fd7117 100644
--- a/src/view/content/fetcher/article.vue
+++ b/src/view/content/fetcher/article.vue
@@ -185,13 +185,3 @@ const handlerSaveArticle = () => {
}
-
-
diff --git a/src/view/mediaFile/index.vue b/src/view/mediaFile/index.vue
index 8f43433..edeb420 100644
--- a/src/view/mediaFile/index.vue
+++ b/src/view/mediaFile/index.vue
@@ -7,16 +7,31 @@
@on-before-upload="beforeUpload" />
+ { search.category = undefined }">
+
+
查询
-
+
-
+ style="width: 120px; height: 100px;" />
+
+
+
+
+
+
+
+
+
+
@@ -24,12 +39,21 @@
{{ formatDate(scope.row.UpdatedAt) }}
-
+
{{ scope.row.name }}
-
+
+
+ {{ scope.row.url }}
+
+
+
+
+ {{ filterDict(scope.row.category, mediaFileCategoryOpts) }}
+
+
{{ scope.row.tag }}
@@ -56,12 +80,10 @@
import { getUrl } from '@/utils/image'
import { getFileList, deleteFile, editFileName } from '@/api/mediaFile'
import { downloadImage } from '@/utils/downloadImg'
-import CustomPic from '@/components/customPic/index.vue'
import UploadImage from '@/components/upload/image.vue'
import UploadCommon from '@/components/upload/common.vue'
-import { formatDate } from '@/utils/format'
+import { getDictFunc, formatDate, filterDict } from '@/utils/format'
import WarningBar from '@/components/warningBar/warningBar.vue'
-
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
@@ -69,8 +91,16 @@ defineOptions({
name: 'Upload',
})
-const path = ref(import.meta.env.VITE_BASE_API)
+const mediaFileCategoryOpts = ref([])
+// 获取需要的字典 可能为空 按需保留
+const setOptions = async () => {
+ mediaFileCategoryOpts.value = await getDictFunc('mediaFileCategory')
+}
+// 获取需要的字典 可能为空 按需保留
+setOptions()
+
+const path = ref(import.meta.env.VITE_BASE_API)
const page = ref(1)
const total = ref(0)
const pageSize = ref(10)
@@ -78,6 +108,22 @@ const search = ref({})
const tableData = ref([])
const fullscreenLoading = ref(false)
+const isImage = (tag) => {
+ tag = tag.toLowerCase()
+ if (tag == 'jpg' || tag == 'png' || tag == 'webp' || tag == 'gif') {
+ return true
+ }
+ return false
+}
+
+const isVideo = (tag) => {
+ tag = tag.toLowerCase()
+ if (tag == 'mp4' || tag == 'ogg' || tag == 'webm') {
+ return true
+ }
+ return false
+}
+
// 分页
const handleSizeChange = (val) => {
pageSize.value = val
@@ -178,6 +224,10 @@ const editFileNameFunc = async (row) => {
})
})
}
+
+const clickPreviewVideo = () => {
+ console.log('clickPreviewVideo')
+}
+