gemercheung 3 лет назад
Родитель
Сommit
b92ab0aea6

+ 1 - 1
package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "bootstrap": "pnpm install",
     "serve": "npm run dev",
-    "dev": "vite --debug",
+    "dev": "vite",
     "build": "cross-env NODE_ENV=production vite build && esno ./build/script/postBuild.ts",
     "build:test": "cross-env vite build --mode test && esno ./build/script/postBuild.ts",
     "build:no-cache": "pnpm clean:cache && npm run build",

+ 16 - 0
src/api/corporation/list.ts

@@ -1,9 +1,12 @@
 import { defHttp } from '/@/utils/http/axios';
 import { PageParams, CorporationListGetResultModel } from './model';
 
+import { Result, UploadFileParams } from '/#/axios';
+
 enum Api {
   selectCompanyNum = '/zfb-api/zfb/company/selectCompanyNum',
   selectCompanyByType = '/zfb-api/zfb/company/selectCompanyByType',
+  uploadLogo = '/zfb-api/zfb/company/uploadLogo',
 }
 
 /**
@@ -28,3 +31,16 @@ export const ListVerifyApi = (params: PageParams) =>
       ignoreCancelToken: true,
     },
   });
+
+export function uploadLogoApi(
+  params: UploadFileParams,
+  onUploadProgress: (progressEvent: ProgressEvent) => void,
+) {
+  return defHttp.uploadFile<Result>(
+    {
+      url: Api.uploadLogo,
+      onUploadProgress,
+    },
+    params,
+  );
+}

+ 3 - 1
src/api/sys/menu.ts

@@ -1,6 +1,8 @@
 import { defHttp } from '/@/utils/http/axios';
 import { getMenuListResultModel } from './model/menuModel';
-
+// sys/user/list
+// /sys/role/list
+// sys/menu/queryAll
 enum Api {
   GetMenuList = '/getMenuList',
 }

+ 1 - 1
src/api/sys/user.ts

@@ -5,9 +5,9 @@ import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
   Login = '/basic-api/sys/login',
+  GetPermCode = '/getPermCode',
   Logout = '/logout',
   GetUserInfo = '/basic-api/getUserInfo',
-  GetPermCode = '/getPermCode',
 }
 
 /**

+ 1 - 1
src/components/Table/src/hooks/useColumns.ts

@@ -153,7 +153,7 @@ export function useColumns(
       })
       .map((column) => {
         const { slots, dataIndex, customRender, format, edit, editRow, flag } = column;
-        Reflect.deleteProperty(column, 'slots');
+
         if (!slots || !slots?.title) {
           column.slots = { title: `header-${dataIndex}`, ...(slots || {}) };
           column.customTitle = column.title;

+ 7 - 6
src/views/dashboard/corporation/index.vue

@@ -6,7 +6,7 @@
         <CropperAvatar
           :showBtn="false"
           :width="80"
-          :uploadApi="uploadApi"
+          :uploadApi="uploadLogoApi"
           :value="record.sceneLogo"
         />
       </template>
@@ -14,7 +14,7 @@
         <CropperAvatar
           :showBtn="false"
           :width="80"
-          :uploadApi="uploadApi"
+          :uploadApi="uploadLogoApi"
           :value="record.floorLogo"
         />
       </template>
@@ -22,7 +22,7 @@
         <CropperAvatar
           :showBtn="false"
           :width="80"
-          :uploadApi="uploadApi"
+          :uploadApi="uploadLogoApi"
           :value="record.bgMusic"
         />
       </template>
@@ -63,10 +63,10 @@
   import { BasicTable, useTable, BasicColumn, FormProps, TableAction } from '/@/components/Table';
   // import { CollapseContainer } from '/@/components/Container';
   import { CropperAvatar } from '/@/components/Cropper';
-  import { uploadApi } from '/@/api/sys/upload';
+  // import { uploadApi } from '/@/api/sys/upload';
   // import { Avatar } from 'ant-design-vue';
   // import { getBasicColumns, getBasicData } from './tableData';
-  import { ListApi } from '/@/api/corporation/list';
+  import { ListApi, uploadLogoApi } from '/@/api/corporation/list';
   import { useModal } from '/@/components/Modal';
   import chargeModal from './chargeModal.vue';
   import deviceModal from './deviceModal.vue';
@@ -219,7 +219,8 @@
         registerDeviceModal,
         registerSubaccountModal,
         handleOpenModal,
-        uploadApi: uploadApi as any,
+
+        uploadLogoApi: uploadLogoApi as any,
       };
     },
   });