diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e3f7c27..7c76265 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png
new file mode 100644
index 0000000..e3f7c27
Binary files /dev/null and b/src/assets/logo/logo1.png differ
diff --git a/src/components/UploadFileFormData/index.vue b/src/components/UploadFileFormData/index.vue
index e3c3b7a..8025ca5 100644
--- a/src/components/UploadFileFormData/index.vue
+++ b/src/components/UploadFileFormData/index.vue
@@ -40,7 +40,7 @@ export default {
// 文件类型
fileType: {
type: Array,
- default: [],
+ default: ['doc', 'docx', 'ppt', 'pptx', 'mp4', 'pdf'],
},
// 文件大小
fileSize: {
diff --git a/src/views/dataManage/pro-materials/components/addAndEditForm.vue b/src/views/dataManage/pro-materials/components/addAndEditForm.vue
index f82870f..4332067 100644
--- a/src/views/dataManage/pro-materials/components/addAndEditForm.vue
+++ b/src/views/dataManage/pro-materials/components/addAndEditForm.vue
@@ -46,7 +46,6 @@
+
+
+
+
+
/
-
- {{ scope.row.typeId === 1 ? '物料' : '视频' }}
+
+ {{
+ scope.row.files[0].fileType === 1
+ ? '物料'
+ : '视频'
+ }}
+ /
@@ -197,6 +222,7 @@
import {
getProMaterialsListAPI,
deleteProductCenterAPI,
+ getProductListAPI,
} from '@/api/dataManage/pro-materials'
import { encryptCBCTime } from '@/utils/aes'
import useBase64 from '@/utils/base64Utils.js'
@@ -215,9 +241,11 @@ export default {
formType: 1,
detailsId: null,
tableData: [],
+ productList: [],
queryParams: {
name: undefined,
typeId: undefined,
+ productId: undefined,
pageNum: 1,
pageSize: 10,
},
@@ -230,6 +258,10 @@ export default {
prop: 'typeName',
label: '类型',
},
+ {
+ prop: 'productName',
+ label: '归属产品',
+ },
{
prop: 'version',
label: '版本',
@@ -280,6 +312,7 @@ export default {
},
created() {
this.getProMaterialsListFun()
+ this.getProductList()
},
methods: {
// 获取列表数据
@@ -362,6 +395,8 @@ export default {
)
filePreviewPath = `${this.lookFile}${encodedPath}&token=${time}`
+ console.log('filePreviewPath', filePreviewPath)
+
const isEdgeOrOther = /Edg|Chrome|Firefox|Safari/.test(
navigator.userAgent,
)
@@ -372,8 +407,17 @@ export default {
}
this.iframeUrl = filePreviewPath
+
+ console.log('this.iframeUrl', this.iframeUrl)
this.previewDialogConfig.outerVisible = true
},
+
+ // 获取归属产品下拉选
+ async getProductList() {
+ const res = await getProductListAPI({ typeId: '' })
+
+ this.productList = res.data
+ },
},
}
diff --git a/src/views/publicService/components/navBar.vue b/src/views/publicService/components/navBar.vue
index 5438076..aa9831a 100644
--- a/src/views/publicService/components/navBar.vue
+++ b/src/views/publicService/components/navBar.vue
@@ -4,7 +4,7 @@