From 3693c1c30550d804b3879365895a0c1b0d900bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Tue, 25 Feb 2025 15:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartExcel/cpts/picture-add.vue       | 18 +++++++++++-------
 .../smartExcel/cpts/picture-collection.vue     | 15 ++++++++++++---
 .../base/smartExcel/cpts/share-excel.vue       |  9 ++-------
 .../modules/base/smartExcel/sharedSpace.vue    |  7 ++++---
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/base/smartExcel/cpts/picture-add.vue b/src/views/modules/base/smartExcel/cpts/picture-add.vue
index c8bf50762..f5c90928f 100644
--- a/src/views/modules/base/smartExcel/cpts/picture-add.vue
+++ b/src/views/modules/base/smartExcel/cpts/picture-add.vue
@@ -5,8 +5,8 @@
                 <el-row>
 
                     <el-col :span="24">
-                        <el-form-item label="图片集名称" prop="title" label-width="150px">
-                            <el-input v-model.trim="formData.title" size="small" clearable placeholder="请输入图片集名称(30字以内)"
+                        <el-form-item label="图片集名称" prop="albumName" label-width="150px">
+                            <el-input v-model.trim="formData.albumName" size="small" clearable placeholder="请输入图片集名称(30字以内)"
                                 class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
@@ -20,8 +20,8 @@
                     </el-col>
                     
                     <el-col :span="24">
-                        <el-form-item label-width="150px" label="共享范围" prop="columnId">
-                            <el-select v-model="formData.columnId" placeholder="仅本组织内共享" clearable>
+                        <el-form-item label-width="150px" label="共享范围" prop="sharedScope">
+                            <el-select v-model="formData.sharedScope" placeholder="仅本组织内共享" clearable>
                                 <el-option v-for="item in sharingScopeList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
@@ -82,6 +82,10 @@
             ],
             formData:
             {
+                coverPicture:"",
+                albumName:"",
+                sharedScope:""
+
             },
             corganizerList: [],
             uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
@@ -120,9 +124,9 @@
                 fileUrl: item.response.data.url
             })) : []; // 当e为空时清空fileList
             if (e.length > 0) {
-                this.formData.coverImg = e[0].response.data.url;
+                this.formData.coverPicture = e[0].response.data.url;
             } else {
-                this.formData.coverImg = '';
+                this.formData.coverPicture = '';
             }
         },
         async initForm(type, activityId) {
@@ -214,7 +218,7 @@
            this.addActivity()
         },
         async addActivity() {
-                let url = '/voluntary/newsTrends/saveOrUpdate'
+                let url = '/actual/base/albums/save'
                 const { data, code, msg } = await requestPost(url, this.formData)
                 if (code === 0) {
                     this.$message({
diff --git a/src/views/modules/base/smartExcel/cpts/picture-collection.vue b/src/views/modules/base/smartExcel/cpts/picture-collection.vue
index c6d175505..2777eb1e5 100644
--- a/src/views/modules/base/smartExcel/cpts/picture-collection.vue
+++ b/src/views/modules/base/smartExcel/cpts/picture-collection.vue
@@ -1,8 +1,12 @@
 <template>
     <div class="" style="height: 900px;margin: 20px;">
         <div v-if="!showPictureList">
-            <el-button type="primary" style="margin:20px 0  20px 0" size="small"
+            <div class="flex  f-align_item ">
+                <el-button type="primary" style="margin:20px 0  20px 0" size="small"
                 @click="onClick('add')">新建图片库</el-button>
+            <el-input @blur="onSelect" v-model="name" placeholder="请输入内容" style="width: 200px; margin-left: 50px;"></el-input>
+            </div>
+         
             <div>
                 <div class="gallery">
                     <div v-for="(item, index) in pictureList" style="margin-bottom: 30px;">
@@ -36,9 +40,9 @@
                 <picture-add ref="ref_form" @closeAdd="closeAdd"></picture-add>
             </el-dialog>
         </div>
-         <div v-if="showPictureList"> 
+        <div v-if="showPictureList">
             <picture-list ref="ref_form" @closeAdd="closePictureList"></picture-list>
-         </div>
+        </div>
 
     </div>
 </template>
@@ -88,6 +92,7 @@ data() {
             },
        
         ],
+        name:"",
         pageNo: 1,
         pageSize: window.localStorage.getItem("pageSize") || 20,
         taskId:"",
@@ -101,6 +106,10 @@ mounted() {
     this.getTableData()
 },
 methods: {
+    onSelect(){
+        console.log(this.name,"dsflkjslkdf");
+        
+    },
     closePictureList(){
         console.log("dslkfjklsd");
         
diff --git a/src/views/modules/base/smartExcel/cpts/share-excel.vue b/src/views/modules/base/smartExcel/cpts/share-excel.vue
index ff729377c..42544fedb 100644
--- a/src/views/modules/base/smartExcel/cpts/share-excel.vue
+++ b/src/views/modules/base/smartExcel/cpts/share-excel.vue
@@ -5,15 +5,10 @@
           <div>
             <el-button type="text" round @click="handelClickBack" 
               icon="el-icon-back">返回</el-button>
-              <el-button type="warning"  @click="handleClickInspect">上传统计模板
-                </el-button>
-            <el-button type="success" @click="onClickUplond()"> 数据列表导出</el-button>
           </div>
           <div>
-            <el-button type="danger"
-              @click="handleClickCurrencyEvent('rejected')"> 取消</el-button>
             <el-button type="primary" 
-              @click="handleClickCurrencyEvent('submit')"> 提交</el-button>
+              @click="handleClickCurrencyEvent('submit')">下载</el-button>
           </div>
         </div>
         <div id="luckysheet"></div>
@@ -214,7 +209,7 @@
         console.log('setsheet', e);
       },
       handelClickBack() {
-        this.$emit('close')
+        this.$emit('handleShowPage')
       },
   
     },
diff --git a/src/views/modules/base/smartExcel/sharedSpace.vue b/src/views/modules/base/smartExcel/sharedSpace.vue
index 9e17886d2..94420d166 100644
--- a/src/views/modules/base/smartExcel/sharedSpace.vue
+++ b/src/views/modules/base/smartExcel/sharedSpace.vue
@@ -50,6 +50,7 @@
               <el-button @click=" handleInfo(scope.row)" type="text" size="small">查看</el-button>
             </template>
           </el-table-column>
+       
         </el-table>
         <div v-if="selectedIndex==0">
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -72,7 +73,7 @@
       </el-dialog>
     </div>
     <div v-if="pageType == 'info'">
-      <excel-info @handleShowPage="handleShowPage" :taskId=task></excel-info>
+      <share-excel @handleShowPage="handleShowPage" :taskId=task></share-excel>
     </div>
     <div v-if="pageType == 'add'">
       <excel-add @handleShowPage="handleShowPage"></excel-add>
@@ -83,13 +84,13 @@
   import { requestPost, requestGet } from "@/js/dai/request";
   import nextTick from "dai-js/tools/nextTick";
   import { mapGetters } from "vuex";
-  import excelInfo from "./cpts/excel-info";
+  import shareExcel from "./cpts/share-excel";
   import excelAdd from "./cpts/excel-add";
   import exportShared from "./cpts/export-shared.vue"
   import dataSharing from "./cpts/data-sharing.vue"
   import pictureCollection from "./cpts/picture-collection.vue"
   export default {
-    components: { excelInfo, excelAdd,exportShared,dataSharing,pictureCollection},
+    components: { exportShared,dataSharing,pictureCollection,shareExcel},
   
     data() {
       let endDisabledDate = (time) => {