修改上传bug

src/api/system/oss/index.ts

@@ -13,11 +13,11 @@ export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
 }
 
 // 查询OSS对象基于id串
-export function listByIds(ossId: string | number): AxiosPromise<OssVO[]> {
+export function listByIds(ossId: string | number | Array<string | number> ): AxiosPromise<OssVO[]> {
   return request({
     url: '/resource/oss/listByIds',
     method: 'post',
-    data: [ossId],
+    data: ossId,
   })
 }
 
@@ -26,6 +26,6 @@ export function delOss(ossId: string | number | Array<string | number>) {
   return request({
     url: '/resource/oss/delete',
     method: 'post',
-    data: [ossId],
+    data: ossId,
   })
 }

src/components/FileUpload/index.vue

@@ -117,7 +117,8 @@ watch(
         list = val
       } else {
         if (props.uploadType === 'ossId') {
-          const res = await listByIds(val as string)
+
+          const res = await listByIds(val.split(',') as Array<number>)
           list = res.data.map((oss) => {
             const data = { name: oss.originalName, url: oss.url, ossId: oss.id }
             return data

src/views/system/oss/index.vue

@@ -59,9 +59,9 @@
 <!--                previewListResource ? "禁用" : "启用" }}</el-button-->
 <!--            >-->
 <!--          </el-col>-->
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Operation" @click="handleOssConfig" v-hasPermi="['system:oss:list']">配置管理</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="info" plain icon="Operation" @click="handleOssConfig" v-hasPermi="['system:oss:list']">配置管理</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
@@ -93,16 +93,16 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" sortable="custom">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="上传人" align="center" prop="createByName" />
+<!--        <el-table-column label="上传人" align="center" prop="createByName" />-->
         <el-table-column label="服务商" align="center" prop="service" sortable="custom" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="下载" placement="top">
-              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['system:oss:download']" />
-            </el-tooltip>
+<!--            <el-tooltip content="下载" placement="top">-->
+<!--              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['system:oss:download']" />-->
+<!--            </el-tooltip>-->
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']" />
             </el-tooltip>
@@ -198,7 +198,7 @@ const getList = async () => {
   previewListResource.value = res?.msg === undefined ? true : res.msg === 'true'
   console.log(daterangeCreateTime)
   const params = daterangeCreateTime.value[0] ?  proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, 'CreateTime') : {}
-  const response: any = await listOss(params)
+  const response: any = await listOss(proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, 'CreateTime'))
   ossList.value = response.data.rows
   total.value = response.total
   loading.value = false
@@ -236,7 +236,7 @@ function resetQuery() {
 }
 /** 选择条数  */
 function handleSelectionChange(selection: OssVO[]) {
-  ids.value = selection.map(item => item.ossId)
+  ids.value = selection.map(item => item.id)
   single.value = selection.length != 1
   multiple.value = !selection.length
 }
@@ -314,7 +314,7 @@ const submitForm = () => {
 }
 /** 下载按钮操作 */
 const handleDownload = (row: OssVO) => {
-  proxy?.$download.oss(row.ossId)
+  proxy?.$download.oss(row.id)
 }
 /** 用户状态修改  */
 const handlePreviewListResource = async (preview: boolean) => {
@@ -326,7 +326,8 @@ const handlePreviewListResource = async (preview: boolean) => {
 }
 /** 删除按钮操作 */
 const handleDelete = async (row?: OssVO) => {
-  const ossIds = row?.id || ids.value
+  // const ossIds = row?.id || ids.value
+  const ossIds = row?.id ? [row.id] : ids.value
   await proxy?.$modal.confirm('是否确认删除OSS对象存储编号为"' + ossIds + '"的数据项?')
   loading.value = true
   await delOss(ossIds).finally(() => loading.value = false)