From 5fb72172a2496c15ece68a8eb1fe9542bab28cb7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Sat, 8 Feb 2025 13:48:36 +0800
Subject: [PATCH] =?UTF-8?q?websocket=E4=BD=BF=E7=94=A8wss=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=EF=BC=8C=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E6=B4=BE=E7=BB=99=E5=85=B6=E4=BB=96=E4=BA=BA=E7=9A=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.preview                                             | 2 +-
 .env.test                                                | 2 +-
 src/views/modules/base/smartExcel/cpts/excel-info.vue    | 2 +-
 src/views/modules/base/smartExcel/cpts/excel-summary.vue | 6 ++++--
 src/views/modules/base/smartExcel/cpts/excel-view.vue    | 7 ++++++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.env.preview b/.env.preview
index 09fde55e4..7f37a7ec4 100644
--- a/.env.preview
+++ b/.env.preview
@@ -1,7 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  http://120.27.18.76/api
 VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
-VUE_APP_SOCKET_SERVER =  ws://epmet-preview.elinkservice.cn/api
+VUE_APP_SOCKET_SERVER =  wss://epmet-preview.elinkservice.cn/api
 VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route
 VUE_APP_NODE_ENV=preview
 VUE_APP_PUBLIC_PATH=epmet-work-pc
\ No newline at end of file
diff --git a/.env.test b/.env.test
index c757167b5..94eb044a3 100644
--- a/.env.test
+++ b/.env.test
@@ -1,6 +1,6 @@
 NODE_ENV=test
 VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route
-VUE_APP_SOCKET_SERVER =  ws://epmet-test.elinkservice.cn/api
+VUE_APP_SOCKET_SERVER =  wss://epmet-test.elinkservice.cn/api
 VUE_APP_NODE_ENV=test
 VUE_APP_PUBLIC_PATH=epmet-work-pc
\ No newline at end of file
diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue
index a923bce2d..bf741fcca 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue
@@ -75,7 +75,7 @@
                     <el-table-column fixed="right" label="汇报情况" align="center">
                         <template slot-scope="scope">
                             <el-button @click=" handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum
-                                }}/{{ scope.row.taskNum
+                                }}/{{ scope.row.totalNum
                                 }}</el-button>
                             <el-button @click="handelClickShowSummary(scope.row)" type="text" size="small">查看</el-button>
                         </template>
diff --git a/src/views/modules/base/smartExcel/cpts/excel-summary.vue b/src/views/modules/base/smartExcel/cpts/excel-summary.vue
index fde8c4140..ee2ed3b56 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-summary.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-summary.vue
@@ -20,7 +20,7 @@
             </div>
         </div>
         <div v-if="showView">
-            <excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal" :mergeObj="mergeObj"></excel-view>
+            <excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal" :mergeObj="mergeObj" :userId="userId"></excel-view>
         </div>
     </div>
 </template>
@@ -37,7 +37,8 @@ export default {
             workbookId:'',
             sheetTotal:false,
             infoObj:{},
-            mergeObj:null//用于传递subworkbookId与workbookId
+            mergeObj:null,//用于传递subworkbookId与workbookId
+            userId:''
         };
     },
     created() {
@@ -86,6 +87,7 @@ export default {
             this.showView = true;
             this.sheetTotal =  false
             this.workbookId = val.taskId;
+            this.userId = val.userId;
             this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
             this.mergeObj = {subWorkBookId,workBookId }
         },
diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue
index 65d21e343..34269f0a1 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue
@@ -80,6 +80,10 @@ export default {
     mergeObj:{
       type:Object,
       default:()=>{}
+    },
+    userId:{
+      type:String,
+      default:''
     }
   },
   computed: {
@@ -105,7 +109,8 @@ export default {
       let parm = {
         taskId: this.workbookId,//注：此处实际为任务Id只是没必要再声明另外一个参数了
         pageNo: 1,
-        pageSize: 1000
+        pageSize: 1000,
+        userId:this.userId
       }
       let { data, code, msg } = await requestGet('/actual/base/communityOneTablePeriodPublish/myPageList', parm)
       if (code === 0) {