duy 4 долоо хоног өмнө
parent
commit
c6e2e6225c

+ 10 - 1
src/api/modules/other-file/album.js

@@ -11,7 +11,7 @@ export default {
             params: form,
         })
     },
-        //接口相册列表
+        //接口相册列表修改
     async update(form) {
         return HcApi({
             url: '/api/blade-manager/album/update',
@@ -19,6 +19,7 @@ export default {
             data: form,
         })
     },
+    //新增
     async save(form) {
         return HcApi({
             url: '/api/blade-manager/album/save',
@@ -26,4 +27,12 @@ export default {
             data: form,
         })
     },
+
+     async remove(form) {
+        return HcApi({
+            url: '/api/blade-manager/album/remove',
+            method: 'post',
+            params: form,
+        })
+    },
 }

+ 45 - 13
src/views/other-file/image-data.vue

@@ -38,7 +38,7 @@
                 <template #groupNumber="{ row }">
                     <span v-if="!row.isEditing">{{ row.groupNumber }}</span>
                  
-                    <el-input-number v-else v-model="row.count" :controls="false" :precision="0" :min="0" style="width: 100%;" />
+                    <el-input-number v-else v-model="row.groupNumber" :controls="false" :precision="0" :min="0" style="width: 100%;" />
                 </template>
                 <template #photographer="{ row }">
                     <span v-if="!row.isEditing">{{ row.photographer }}</span>
@@ -49,13 +49,13 @@
                     <hc-date-picker v-else :dates="betweenTime" clearable @change="betweenTimeUpdate($event, row)" />
                 </template>
                 <template #imagesName="{ row }">
-                    <span v-if="!row.isEditing">{{ row.imagesName }}</span>
+                    <span v-if="!row.isEditing" class="cursor-pointer" @click="viewPdf(row)">{{ row.imagesName }}</span>
                     <el-input v-else v-model="row.imagesName" placeholder="请输入" />
                 </template>
                 <template #action="{ row }">
                     <el-link v-if="!row.isEditing" type="primary" @click="startEditing(row)">编辑</el-link>
-                    <el-link v-else type="success" @click="saveEditing(row)">保存</el-link>
-                    <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+                    <el-link v-else v-loading="row.load" type="success" @click="saveEditing(row)">保存</el-link>
+                    <el-link v-del-com:[handleDelete]="row" type="danger">删除</el-link>
                 </template>
             </HcTable>
         </HcNewCard>
@@ -85,6 +85,7 @@ import imageApi from '~api/other-file/imageData'
 import albumApi from '~api/other-file/album'
 import { delStoreValue } from '~src/utils/storage'
 import { getArrValue } from 'js-fast-way'
+import { toPdfPage } from '~uti/btn-auth'
 //变量
 const router = useRouter()
 const useAppState = useAppStore()
@@ -219,9 +220,7 @@ const imageListColumn = ref([
     { key: 'action', name: '操作', width: 100 },
 ])
 const imageListData = ref([
-    { className:'基础设施1', count: '1', user: '张三', date: '2023-01-01 至 2023-01-31', fileName: '基础设施照片1.jpg' },
-    { className:'基础设施2', count: '1', user: '张三', date: '2023-01-01 至 2023-01-31', fileName: '基础设施照片1.jpg' },
-    { className:'基础设施3', count: '1', user: '张三', date: '2023-01-01 至 2023-01-31', fileName: '基础设施照片1.jpg' },
+ 
 ])
 
 const getImageListData = async () => {
@@ -233,7 +232,7 @@ const getImageListData = async () => {
     //处理数据
     tableLoading.value = false
     if (!error && code === 200) {
-        imageListData.value = getArrValue(data)
+        imageListData.value = getArrValue(data['records'])
     } else {
         imageListData.value = []
     }
@@ -249,20 +248,53 @@ const betweenTimeUpdate = ({ arr, val, query }, row) => {
     console.log(query, 'query')
     
     
+}
+const viewPdf = (row) => {
+    // 这里可以添加查看PDF的逻辑
+   const { imagesPdf } = row
+    if (imagesPdf) {
+        toPdfPage(imagesPdf)
+    } else {
+        window.$message.warning('暂无数据')
+    }
 }
 const imageLoading = ref(false)
 
-const handleDelete = (row) => {
-    // 这里可以添加删除逻辑
-    console.log('删除:', row)
+
+const handleDelete = async ({ item }, resolve) => {
+    await delData(item.id)
+    resolve()
+}
+const delData = async (id) => {
+    const { error, code } = await albumApi.remove({ id: id }, false)
+    //判断状态
+    if (!error && code === 200) {
+        window?.$message?.success('删除成功')
+        getImageListData()
+    } else {
+        window?.$message?.error('删除失败')
+    }
 }
 const startEditing = (row) => {
     // 这里可以添加删除逻辑
 
     row.isEditing = true
+    betweenTime.value = row.dateValue.split('~')
 }
-const saveEditing = (row) => {
-       row.isEditing = false
+const saveEditing = async (row) => {
+    row.load = true
+        const { error, code, msg } = await albumApi.update(
+       { ...row,
+
+       },
+    )
+    //判断状态
+    if (!error && code === 200) {
+        window.$message?.success(msg)
+        getImageListData()
+        row.isEditing = false
+    } 
+     row.isEditing = false
 }
 </script>
 

+ 1 - 1
src/views/other-file/image-view.vue

@@ -58,7 +58,7 @@
                             <span>下载PDF</span>
                         </el-button>
                     </HcTooltip>
-                    <HcTooltip keys="image-data-download">
+                    <HcTooltip keys="image-data-album">
                         <el-button
                             :disabled="tableCheckedKeys.length <= 0" :loading="downPdfLoading" hc-btn
                             @click="combineAlbumClick"