From c08f29d4da7e519e195e72fec0cb80749d0344ce Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Mon, 20 Mar 2023 17:36:33 +0800
Subject: [PATCH] fix: bug#10561

---
 src/views/device/Instance/Detail/Function/index.vue | 10 +++++++---
 src/views/system/Basis/index.vue                    |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/device/Instance/Detail/Function/index.vue b/src/views/device/Instance/Detail/Function/index.vue
index 86b995fd..0d1c0cde 100644
--- a/src/views/device/Instance/Detail/Function/index.vue
+++ b/src/views/device/Instance/Detail/Function/index.vue
@@ -12,10 +12,14 @@
         </j-empty>
         <template v-else>
             <j-tabs v-model:activeKey="activeKey">
-                <j-tab-pane key="Simple" tab="精简模式" />
-                <j-tab-pane key="Advance" tab="高级模式" />
+                <j-tab-pane key="Simple" tab="精简模式">
+                    <Simple />
+                </j-tab-pane>
+                <j-tab-pane key="Advance" tab="高级模式">
+                    <Advance />
+                </j-tab-pane>
             </j-tabs>
-            <component :is="tabs[activeKey]" />
+            <!-- <component :is="tabs[activeKey]" /> -->
         </template>
     </j-card>
 </template>
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index d1f8be37..7413ebb1 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -406,13 +406,16 @@ const uploader: uploaderType = {
         'image/pjp',
         'image/pjpeg',
     ],
+    // imageTypes: ['.jpg','.png','.jfif','.pjp','.pjpeg','.jpeg'],
     iconTypes: ['image/x-icon'],
     // logo格式校验
-    beforeLogoUpload: ({ size, type }: File) => {
+    // beforeLogoUpload: ({ size, type }: File) => {
+    beforeLogoUpload: (file: File) => {
+        console.log('file: ', file);
         const typeBool =
-            uploader.imageTypes.filter((typeStr) => type.includes(typeStr))
+            uploader.imageTypes.filter((typeStr) => file.type.includes(typeStr))
                 .length > 0;
-        const sizeBool = size / 1024 / 1024 < 4;
+        const sizeBool = file.size / 1024 / 1024 < 4;
         if (!typeBool) {
             message.error(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`);
         } else if (!sizeBool) {