修复bug

src/components/Cropper/src/CropperAvatar.vue

@@ -101,6 +101,7 @@
 
       function handleUploadSuccess({ source, data }) {
         sourceValue.value = source;
+        console.log('handleUploadSuccess', data);
         emit('change', source, data);
         createMessage.success(t('component.cropper.uploadSuccess'));
       }

src/locales/lang/json/ja.json

@@ -45,6 +45,7 @@
     "dark": "ダークテーマ",
     "delConfirm": "削除しますか？",
     "delText": "削除",
+    "delfolderConfirm": "これにより、現在のフォルダとそのサブフォルダ内のすべてのシーンが削除されます。確認しますか？",
     "details": "詳細",
     "edit": "編集",
     "fullName": "名前",
@@ -665,6 +666,7 @@
       "showMap": "ホームページで表示",
       "snCode": "SNコ一ド",
       "sortOrder": "順番",
+      "time": "時間",
       "unAssistant": "インバイトを終了",
       "unAssistantConfirm": "インバイトを終了しますか?",
       "upgrade": "アップグレード",

src/locales/lang/json/zh-CN.json

@@ -45,6 +45,7 @@
     "dark": "黑暗主题",
     "delConfirm": "是否确认删除",
     "delText": "删除",
+    "delfolderConfirm": "此操作将删除当前文件夹及其子文件夹中所有的场景，是否确认？",
     "details": "详情",
     "edit": "编辑",
     "fullName": "姓名",
@@ -664,6 +665,7 @@
       "showMap": "首页显示",
       "snCode": "SN码",
       "sortOrder": "排序",
+      "time": "时间",
       "unAssistant": "取消协作",
       "unAssistantConfirm": "是否确定取消协作？",
       "upgrade": "升级",

src/views/corporation/index.vue

@@ -289,15 +289,15 @@
         console.log('src', data);
         await updateCompnayApi({
           id: record.id,
-          topLogo: data.data,
+          topLogo: data,
         });
         nextTick(reload);
       }
       async function updateFloorLogo(record: Recordable, data: Result) {
-        console.log('src', data.data);
+        console.log('src', data);
         await updateCompnayApi({
           id: record.id,
-          floorLogo: data.data,
+          floorLogo: data,
         });
         nextTick(reload);
       }

src/views/scenes/folderTreeModal.vue

@@ -27,7 +27,7 @@
           >
           <template #icon>
             <!-- <i class="ph:folder-open-fill"></i> -->
-            <img src="/resource/img/file.png" style="padding: 0 6px 0 0" alt="" />
+            <img src="/resource/img/file.png" style="padding: 3px 6px 0 0" alt="" />
             <!-- <FolderOpenOutlined /> -->
           </template>
           </Tree>
@@ -77,7 +77,12 @@
 
       async function onDataReceive(data: any) {
         let tree = await folderTree({ type: data.type });
-        treeData.value = getTreeData(tree);
+
+        treeData.value = [{
+          title: t('common.root'),
+          key: null,
+          children: getTreeData(tree)
+        }]
         selectData.value.type = Number(data.type);
         selectData.value.numList = data.numList;
       }
@@ -156,7 +161,8 @@
   .treeList {
     min-height: 350px;
     padding: 5px 20px;
-    // overflow-y: scroll;
+    max-height: 350px;
+    overflow-y: scroll;
     border: 1px solid rgba(0, 0, 0, 0.15);
     border-top: none;
     ::-webkit-scrollbar {

src/views/scenes/list.vue

@@ -80,10 +80,11 @@
                 icon: 'material-symbols:delete',
                 tooltip: t('routes.scenes.delete'),
                 ifShow: record.isDel,
-                popConfirm: {
-                  title: t('common.delConfirm'),
-                  confirm: handleFolderDelete.bind(null, record),
-                },
+                onClick: handleFolderDelete.bind(null, record),
+                //popConfirm: {
+                //  title: t('common.delfolderConfirm'),
+                //  confirm: handleFolderDelete.bind(null, record),
+                //},
               }
             ]"
           />
@@ -139,11 +140,12 @@
                 icon: 'material-symbols:delete',
                 tooltip: t('routes.scenes.delete'),
                 ifShow: record.isDel,
+                onClick: handleDelete.bind(null, record),
                 disabled: record.status != -2,
-                popConfirm: {
-                  title: t('common.delConfirm'),
-                  confirm: handleDelete.bind(null, record),
-                },
+                //popConfirm: {
+                //  title: t('common.delConfirm'),
+                //  confirm: handleDelete.bind(null, record),
+                //},
               },
 
               {
@@ -348,7 +350,7 @@
           width: 100,
         },
         {
-          title: t('routes.scenes.createTime'),
+          title: t('routes.scenes.time'),
           dataIndex: 'createTime',
           customRender: ({ record }) => {
             return record.isFolder ? '': record.createTime;
@@ -470,15 +472,15 @@
           loading.value = true;
           return T;
         },
-        // handleSearchInfoFn: (T) => {
-        //   console.log('handleSearchInfoFn', T);
-        //   if(!T.childName && !T.companyName && !T.num && !T.sceneName){
-        //     T.haveFolder = 1;
-        //   }else{
-        //     T.haveFolder = 0;
-        //   }
-        //   return T;
-        // },
+        handleSearchInfoFn: (T) => {
+          console.log('handleSearchInfoFn', T);
+          if(!T.childName && !T.num){
+            T.haveFolder = 1;
+          }else{
+            T.haveFolder = 0;
+          }
+          return T;
+        },
         afterFetch: (T) => {
           loading.value = false;
 
@@ -585,15 +587,33 @@
       }
       async function handleFolderDelete(record: Recordable) {
         console.log('DeleteApi', record);
-        await folderDel({id: record.id});
-        createMessage.success(t('common.optSuccess'));
-        reload();
+        createConfirm({
+          iconType: 'warning',
+          title: () => h('span', t('routes.scenes.delete')),
+          content: () => h('span', t('common.delfolderConfirm')),
+          onOk: async () => {
+            try {
+              await folderDel({id: record.id});
+              createMessage.success(t('common.optSuccess'));
+              reload();
+            } catch (error) {}
+          },
+        });
       }
       async function handleDelete(record: Recordable) {
         console.log('DeleteApi', record);
-        await DeleteApi(record.num);
-        createMessage.success(t('common.optSuccess'));
-        reload();
+        createConfirm({
+          iconType: 'warning',
+          title: () => h('span', t('routes.scenes.delete')),
+          content: () => h('span', t('common.delConfirm')),
+          onOk: async () => {
+            try {
+              await DeleteApi(record.num);
+              createMessage.success(t('common.optSuccess'));
+              reload();
+            } catch (error) {}
+          },
+        });
       }
 
       async function handleDownloadScene(record: Recordable) {