From f2a07c9b6b90f4f76c359ee5d03f6a7505a9cadf Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 27 Jun 2024 20:52:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=B6=E4=BB=96=E5=85=AC=E5=8F=B8=E7=9A=84?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=9B=9B=E8=89=B2=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dangerousWork/electricity/components/detail.vue  |  2 +-
 .../dangerousWork/electricity/components/list.vue    | 12 +++++++++++-
 src/views/dangerousWork/electricity/index.vue        |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/dangerousWork/electricity/components/detail.vue b/src/views/dangerousWork/electricity/components/detail.vue
index 68d76d5..f1d6d8e 100644
--- a/src/views/dangerousWork/electricity/components/detail.vue
+++ b/src/views/dangerousWork/electricity/components/detail.vue
@@ -246,7 +246,7 @@ export default {
       })
     },
     goBack() {
-      this.$parent.activeName = 'List'
+      this.$parent.activeName = 'electricity_list'
     }
 
   }
diff --git a/src/views/dangerousWork/electricity/components/list.vue b/src/views/dangerousWork/electricity/components/list.vue
index 5a22405..8f13eb3 100644
--- a/src/views/dangerousWork/electricity/components/list.vue
+++ b/src/views/dangerousWork/electricity/components/list.vue
@@ -109,6 +109,10 @@
         <el-button type="primary" @click="dialogFormShow = false">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="height: 60px;"></div>
+    <div  class="ui-foot">
+      <el-button type="primary" @click="goBack">返 回</el-button>
+    </div>
   </div>
 </template>
 <script>
@@ -186,7 +190,9 @@ export default {
         '/dangerousWork/gfElectricity/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
-          DEPTIDS: this.DEPTIDS, tm: new Date().getTime()
+          DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
+          ticketType: this.$parent.ticketType
         }
       ).then((data) => {
         this.listLoading = false
@@ -291,6 +297,10 @@ export default {
     goDetail(id) {
       this.$parent.activeName = 'Detail'
       this.$parent.ELECTRICITY_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.BREAKGROUND_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/electricity/index.vue b/src/views/dangerousWork/electricity/index.vue
index 5f08fe2..45fe6f7 100644
--- a/src/views/dangerousWork/electricity/index.vue
+++ b/src/views/dangerousWork/electricity/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <List v-show="activeName=='electricity_list'" />
+    <List v-if="activeName=='electricity_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>