需改bug

src/api/system/menu/index.ts

@@ -42,9 +42,7 @@ export const tenantPackageMenuTreeselect = (packageId: string | number): AxiosPr
   return request({
     url: '/system/menu/tenantPackageMenuTreeselect',
     method: 'post',
-    data: {
-      packageId,
-    },
+    data: packageId
   })
 }
 

src/api/system/oss/index.ts

@@ -1,6 +1,7 @@
 import request from '@/utils/request'
 import { OssQuery, OssVO } from './types'
 import { AxiosPromise } from 'axios'
+import {parseStrEmpty} from "@/utils/ruoyi";
 
 // 查询OSS对象存储列表
 export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
@@ -25,6 +26,6 @@ export function delOss(ossId: string | number | Array<string | number>) {
   return request({
     url: '/resource/oss/delete',
     method: 'post',
-    data: ossId,
+    data: parseStrEmpty(ossId),
   })
 }

src/api/system/tenantPackage/index.ts

@@ -22,7 +22,7 @@ export function selectTenantPackage(): AxiosPromise<TenantPkgVO[]> {
 // 查询租户套餐详细
 export function getTenantPackage(packageId: string | number): AxiosPromise<TenantPkgVO> {
   return request({
-    url: '/system/tenant/package',
+    url: '/system/tenant/package/getInfo/'+packageId,
     method: 'post',
     data: {
       packageId,
@@ -33,7 +33,7 @@ export function getTenantPackage(packageId: string | number): AxiosPromise<Tenan
 // 新增租户套餐
 export function addTenantPackage(data: TenantPkgForm) {
   return request({
-    url: '/system/tenant/package',
+    url: '/system/tenant/package/add',
     method: 'post',
     data,
   })
@@ -42,7 +42,7 @@ export function addTenantPackage(data: TenantPkgForm) {
 // 修改租户套餐
 export function updateTenantPackage(data: TenantPkgForm) {
   return request({
-    url: '/system/tenant/package',
+    url: '/system/tenant/package/edit',
     method: 'post',
     data,
   })
@@ -62,12 +62,13 @@ export function changePackageStatus(packageId: number | string, status: string)
 }
 
 // 删除租户套餐
-export function delTenantPackage(packageId: string | number | Array<string | number>) {
+export function delTenantPackage(data: (string | number)[]) {
   return request({
-    url: '/system/tenant/package',
+    url: '/system/tenant/package/delete',
     method: 'post',
-    data: {
-      packageId,
-    },
+    data
+    // data: {
+    //   packageId,
+    // },
   })
 }

src/views/monitor/logininfor/index.vue

@@ -49,8 +49,8 @@
               解锁
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']">导出</el-button>
+          <el-col :span="1.5" v-if="false">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']" >导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>

src/views/system/tenantPackage/index.vue

@@ -279,7 +279,7 @@ const handleUpdate = (row?: TenantPkgVO) => {
   dialog.title = '修改租户套餐'
   nextTick(async () => {
     reset()
-    const _packageId = row?.packageId || ids.value[0]
+    const _packageId = row?.id || ids.value[0]
     const packageMenu = getPackageMenuTreeselect(_packageId)
     const response = await getTenantPackage(_packageId)
     loading.value = false
@@ -302,7 +302,8 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true
       form.value.menuIds = getMenuAllCheckedKeys()
-      if (form.value.packageId != null) {
+      console.log("#################"+JSON.stringify(form.value))
+      if (form.value.id != null) {
         await updateTenantPackage(form.value).finally(() => buttonLoading.value = false)
       } else {
         await addTenantPackage(form.value).finally(() => buttonLoading.value = false)
@@ -316,11 +317,16 @@ const submitForm = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: TenantPkgVO) => {
-  const _packageIds = row?.packageId || ids.value
-  await proxy?.$modal.confirm('是否确认删除租户套餐编号为"' + _packageIds + '"的数据项？').finally(() => {
+  const _packageIds = row?.id || ids.value
+  await proxy?.$modal.confirm('是否确认删除租户套餐数据项？').finally(() => {
     loading.value = false
   })
-  await delTenantPackage(_packageIds)
+  if (row instanceof Array) {
+    await delTenantPackage(row.map(m => m.id))
+  } else {
+    await delTenantPackage([_packageIds])
+  }
+  // await delTenantPackage(_packageIds)
   loading.value = true
   getList()
   proxy?.$modal.msgSuccess('删除成功')