Merge pull request #90 from KouShenhai/ddd

perf: ddd改造提交
KouShenhai · Feb 27, 2024 · 9166c4d · 9166c4d
2 parents 1829cd2 + 611280b
commit 9166c4d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/src/api/v1/resource.js b/src/api/v1/resource.js
@@ -107,15 +107,6 @@ export function searchResource (query) {
   })
 }
 
-// 上传资源
-export function uploadResource (data) {
-  return request({
-    url: '/admin/v1/resource/upload',
-    method: 'post',
-    data: data
-  })
-}
-
 // 同步资源
 export function syncResourceIndex () {
   return request({

diff --git a/src/views/v1/resource/heaven/view.vue b/src/views/v1/resource/heaven/view.vue
@@ -70,28 +70,28 @@
           <a @click="$refs.createForm.handleAdd()" v-hasPermi="['resource:create']">
             <a-icon type="plus" />新增
           </a>
-          <a-divider type="vertical" v-hasPermi="['resource:modify']" v-if="record.status == 2 || record.status == -1"/>
-          <a v-hasPermi="['resource:modify']" @click="$refs.createForm.handleUpdate(record, undefined)" v-if="record.status == 2 || record.status == -1">
+          <a-divider type="vertical" v-hasPermi="['resource:modify']" v-if="record.status === 2 || record.status === -1"/>
+          <a v-hasPermi="['resource:modify']" @click="$refs.createForm.handleUpdate(record, undefined)" v-if="record.status === 2 || record.status === -1">
             <a-icon type="edit" />修改
           </a>
-          <a-divider type="vertical" v-if="record.status == 2 || record.status == -1" v-hasPermi="['resource:detail']"/>
-          <a @click="handleQuery1(record)" v-if="record.status == 2 || record.status == -1" v-hasPermi="['resource:detail']">
+          <a-divider type="vertical" v-if="record.status === 2 || record.status === -1" v-hasPermi="['resource:detail']"/>
+          <a @click="handleQuery1(record)" v-if="record.status === 2 || record.status === -1" v-hasPermi="['resource:detail']">
             <a-icon type="eye" />查看
           </a>
-          <a-divider type="vertical" v-if="record.status == 2 || record.status == -1" v-hasPermi="['resource:download']"/>
-          <a @click="download(record)" v-if="record.status == 2 || record.status == -1" v-hasPermi="['resource:download']">
+          <a-divider type="vertical" v-if="record.status === 2 || record.status === -1" v-hasPermi="['resource:download']"/>
+          <a @click="download(record)" v-if="record.status === 2 || record.status === -1" v-hasPermi="['resource:download']">
             <a-icon type="download" />下载
           </a>
-          <a-divider type="vertical" v-if="record.status != 2 && record.status != -1" v-hasPermi="['resource:diagram']"/>
-          <a @click="handleQuery2(record)" v-if="record.status != 2 && record.status != -1" v-hasPermi="['resource:diagram']">
+          <a-divider type="vertical" v-if="record.status !== 2 && record.status !== -1" v-hasPermi="['resource:diagram']"/>
+          <a @click="handleQuery2(record)" v-if="record.status !== 2 && record.status !== -1" v-hasPermi="['resource:diagram']">
             <a-icon type="gold" />查看
           </a>
           <a-divider type="vertical" v-hasPermi="['resource:audit-log']"/>
           <a @click="handleQuery3(record)" v-hasPermi="['resource:audit-log']">
             <a-icon type="file" />审批日志
           </a>
-          <a-divider type="vertical" v-if="record.status == 2 || record.status == -1" v-hasPermi="['resource:remove']"/>
-          <a @click="handleDelete(record)" v-if="record.status == 2 || record.status == -1" v-hasPermi="['resource:remove']">
+          <a-divider type="vertical" v-if="record.status === 2 || record.status === -1" v-hasPermi="['resource:remove']"/>
+          <a @click="handleDelete(record)" v-if="record.status === 2 || record.status === -1" v-hasPermi="['resource:remove']">
             <a-icon type="delete" />删除
           </a>
         </span>

diff --git a/src/views/v1/resource/modules/CreateForm.vue b/src/views/v1/resource/modules/CreateForm.vue
@@ -61,7 +61,8 @@
 
 <script>
 
-  import { getResourceById, insertResource, updateResource, uploadResource } from '@/api/v1/resource'
+  import { getResourceById, insertResource, updateResource } from '@/api/v1/resource'
+  import { upload } from '@/api/v1/oss'
   import { getToken } from '@/api/v1/token'
   export default {
     name: 'CreateForm',
@@ -151,7 +152,7 @@
           this.disabled = true
           const formData = new FormData()
           formData.append('file', data.file)
-          uploadResource(formData).then(response => {
+          upload(formData).then(response => {
             this.form.url = response.data.url
             this.display()
           })