From bb07d041af92352a558e3d21d6f9307d9070089e 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: Mon, 24 Mar 2025 14:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=A4=AA=E9=95=BF=EF=BC=8C=E4=B8=8B=E8=BD=BD=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A5=E5=8F=A3=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartExcel/cpts/data-excel.vue       | 19 +++++++++----------
 .../base/smartExcel/cpts/export-view.vue      |  4 ++++
 .../base/smartExcel/cpts/picture-list.vue     |  2 +-
 .../base/smartExcel/cpts/share-excel.vue      |  2 +-
 .../modules/base/smartExcel/sharedSpace.vue   |  4 ++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/base/smartExcel/cpts/data-excel.vue b/src/views/modules/base/smartExcel/cpts/data-excel.vue
index dd509b640..9b80ed08c 100644
--- a/src/views/modules/base/smartExcel/cpts/data-excel.vue
+++ b/src/views/modules/base/smartExcel/cpts/data-excel.vue
@@ -89,14 +89,14 @@
     watch: {},
     async mounted() {
       console.log(this.infoObj,"sdljkdsfj");
-      const newUrl = this.infoObj.url.replace(
-        /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/,
-        `${location.origin}`
-      );
-      console.log(newUrl);
-      // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.infoObj.name)
+      // const newUrl = this.infoObj.url.replace(
+      //   /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/,
+      //   `${location.origin}`
+      // );
+      // console.log(newUrl);
+      this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.infoObj.name)
       
-      this.urlToFile(newUrl, this.fileName)
+      // this.urlToFile(newUrl, this.fileName)
       // console.log(this.workbookId, "dskjlfsdklf");
       // this.currentId = this.workbookId;
       // this.loadWorkBook()
@@ -145,10 +145,9 @@
       handleClickCurrencyEvent(){
         console.log(this.infoObj,"this.infoObj.taskTitle");
         let parms={
-          workbookId:this.workbookId,
-          taskId:this.infoObj.id
+          sdId:this.infoObj.id
         }
-        let { code, msg } =  requestPost('/actual/base/communityOneTableDownloadRecord/save', parms);
+        let { code, msg } =  requestPost('/actual/base/sharedDataHistory/save', parms);
         console.log(code,"dsfkjkldsf");
         
         exportSheetExcel(luckysheet.getAllSheets(),this.infoObj.taskTitle)
diff --git a/src/views/modules/base/smartExcel/cpts/export-view.vue b/src/views/modules/base/smartExcel/cpts/export-view.vue
index fa8c3895b..13675311c 100644
--- a/src/views/modules/base/smartExcel/cpts/export-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/export-view.vue
@@ -9,6 +9,7 @@
           <el-button type="success" @click="onClickUplond" v-if="pageType !== 'info'"> 数据列表导出</el-button>
           <el-button type="success" @click="onClickShowCondition" v-if="pageType === 'info' && this.infoObj.reportType === 0"> 查看数据统计条件</el-button>
           <el-button type="warning" v-if="pageType === 'info' && this.infoObj.reportType === 0" @click="handleClickInspect"> 自动检查</el-button>
+          <span class="red">（操作提示：可双击单元格进行设置统计条件）</span>
         </div>
         <div>
           <el-button type="primary" @click="handleClickExport()"> 导出</el-button>
@@ -1323,4 +1324,7 @@ export default {
     color: #3989eb;
   }
 }
+.red{
+  color: red
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/smartExcel/cpts/picture-list.vue b/src/views/modules/base/smartExcel/cpts/picture-list.vue
index e2c7faa99..9ba9a3a32 100644
--- a/src/views/modules/base/smartExcel/cpts/picture-list.vue
+++ b/src/views/modules/base/smartExcel/cpts/picture-list.vue
@@ -34,7 +34,7 @@
                             </el-dropdown-menu>
                         </el-dropdown>
                     </div>
-                    <div style="margin-top: 10px;">{{ item.name }}
+                    <div style="text-align: center; margin-top: 10px;white-space: nowrap; overflow: hidden; text-overflow: ellipsis;width: 150px;">{{ item.name }}
                     </div>
                     <div style="margin-top: 10px; font-size: 12px; color: #7f89a8;">
                         <span style=""> {{ item.staffName }}</span>
diff --git a/src/views/modules/base/smartExcel/cpts/share-excel.vue b/src/views/modules/base/smartExcel/cpts/share-excel.vue
index e3b1df07d..71214d9d4 100644
--- a/src/views/modules/base/smartExcel/cpts/share-excel.vue
+++ b/src/views/modules/base/smartExcel/cpts/share-excel.vue
@@ -11,7 +11,7 @@
               @click="handleClickCurrencyEvent('submit')">下载</el-button>
           </div>
         </div>
-        <div id="luckysheet"></div>
+        <div id="luckysheet"  :style="{ height: tableHeight }"></div>
       </div>
       <el-dialog title="数据列表导出" v-if="showUploadData" :visible.sync="showUploadData" width="60%"
         :close-on-click-modal="false">
diff --git a/src/views/modules/base/smartExcel/sharedSpace.vue b/src/views/modules/base/smartExcel/sharedSpace.vue
index c26abb237..84d7e2d84 100644
--- a/src/views/modules/base/smartExcel/sharedSpace.vue
+++ b/src/views/modules/base/smartExcel/sharedSpace.vue
@@ -68,7 +68,7 @@
             layout="sizes, prev, pager, next, total" :total="total">
           </el-pagination>
         </div>
-        <div>
+        <div >
           <data-sharing ref="dataSharing":name="name"v-if="selectedIndex==1" @pictureClose="pictureClose" @pictureOpen="pictureOpen"></data-sharing>
         </div>
         <div>
@@ -90,7 +90,7 @@
         <export-shared v-if="showdownloadRecord" :showType="showdownloadRecord" :taskName="downloadRecord.excelName" :taskId="downloadRecord.id"></export-shared>
       </el-dialog>
     </div>
-    <div v-if="pageType == 'info'">
+    <div v-if="pageType == 'info'" >
       <share-excel v-if="pageType == 'info'"  @handleShowPage="handleShowPage"  :infoObj="infoObj" :workbookId=task></share-excel>
     </div>
   </div>