From 59edf1e6af2f02d1f7e91d9ca22e2a7d54605000 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 27 Jun 2024 20:39:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A-?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dangerousWork/highwork/index.vue                 | 4 ++--
 src/views/dangerousWork/limitspace/components/corpInfo.vue | 2 +-
 src/views/dangerousWork/limitspace/components/list.vue     | 2 +-
 src/views/dangerousWork/limitspace/index.vue               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue
index 0a10f2b..59d2d6d 100644
--- a/src/views/dangerousWork/highwork/index.vue
+++ b/src/views/dangerousWork/highwork/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" />
-    <List v-show="activeName=='highwork_list'" />
+    <List v-if="activeName=='highwork_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
@@ -14,7 +14,7 @@ export default {
   components: {CorpInfo,List,Detail},
   data() {
     return {
-      activeName: 'highwork_list',
+      activeName: 'CorpInfo',
       HIGHWORK_ID: ''
     }
   },
diff --git a/src/views/dangerousWork/limitspace/components/corpInfo.vue b/src/views/dangerousWork/limitspace/components/corpInfo.vue
index 66c7651..112ca76 100644
--- a/src/views/dangerousWork/limitspace/components/corpInfo.vue
+++ b/src/views/dangerousWork/limitspace/components/corpInfo.vue
@@ -108,7 +108,7 @@ export default {
       return new Promise((resolve) => {
         this.listLoading = true
         requestFN(
-          '/gfLimitSpace/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+          '/gfConfinedSpace/corpCountlist?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
           {
             COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '',
             KEYWORDS: this.KEYWORDS
diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue
index f2b598a..44de790 100644
--- a/src/views/dangerousWork/limitspace/components/list.vue
+++ b/src/views/dangerousWork/limitspace/components/list.vue
@@ -242,7 +242,7 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/gfLimitSpace/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/gfConfinedSpace/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS, APPLY_STATUS: this.STATUS,
           DEPTIDS: this.DEPTIDS, tm: new Date().getTime(),
diff --git a/src/views/dangerousWork/limitspace/index.vue b/src/views/dangerousWork/limitspace/index.vue
index d450b83..6e79603 100644
--- a/src/views/dangerousWork/limitspace/index.vue
+++ b/src/views/dangerousWork/limitspace/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <circuitList v-show="activeName=='LimitSpace'"/>
+    <circuitList v-if="activeName=='LimitSpace'"/>
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>

From 7bbb361e1b876a4f5dc2e89e330c9b8b33d5a403 Mon Sep 17 00:00:00 2001
From: zy <907315977@qq.com>
Date: Thu, 27 Jun 2024 21:26:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A-?=
 =?UTF-8?q?=E9=AB=98=E5=A4=84=E4=BD=9C=E4=B8=9A-=E5=90=8A=E8=A3=85?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9Abug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../highwork/components/detail.vue            |  2 +-
 .../highwork/components/list.vue              | 15 ++++++++++++++-
 src/views/dangerousWork/highwork/index.vue    | 19 +++++++------------
 .../hoisting/components/corpInfo.vue          |  2 +-
 .../hoisting/components/list.vue              | 16 ++++++++++++++--
 src/views/dangerousWork/hoisting/index.vue    |  6 ++++--
 6 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/views/dangerousWork/highwork/components/detail.vue b/src/views/dangerousWork/highwork/components/detail.vue
index b551ab1..a83db7f 100644
--- a/src/views/dangerousWork/highwork/components/detail.vue
+++ b/src/views/dangerousWork/highwork/components/detail.vue
@@ -248,7 +248,7 @@ export default {
       })
     },
     goBack() {
-      this.$parent.activeName = 'List'
+      this.$parent.activeName = 'highwork_list'
     }
 
   }
diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue
index b2ab9b8..6b4fbf9 100644
--- a/src/views/dangerousWork/highwork/components/list.vue
+++ b/src/views/dangerousWork/highwork/components/list.vue
@@ -132,7 +132,14 @@
         <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>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@@ -211,7 +218,9 @@ export default {
         '/dangerousWork/gfHighWork/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
@@ -326,6 +335,10 @@ export default {
     goDetail(id) {
       this.$parent.activeName = 'Detail'
       this.$parent.HIGHWORK_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.HIGHWORK_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue
index 0a10f2b..1a54661 100644
--- a/src/views/dangerousWork/highwork/index.vue
+++ b/src/views/dangerousWork/highwork/index.vue
@@ -1,28 +1,23 @@
 <template>
   <div>
-    <CorpInfo v-show="activeName=='CorpInfo'" />
-    <List v-show="activeName=='highwork_list'" />
+    <CorpInfo v-show="activeName=='CorpInfo'" ref="list"/>
+    <List v-if="activeName=='highwork_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
 
 <script>
+import CorpInfo from "./components/corpInfo";
 import List from './components/list'
 import Detail from './components/detail'
-import CorpInfo from "./components/corpInfo";
 export default {
   components: {CorpInfo,List,Detail},
   data() {
     return {
-      activeName: 'highwork_list',
-      HIGHWORK_ID: ''
-    }
-  },
-  watch: {
-    activeName(val) {
-      if (val == 'highwork_list') {
-        this.$refs.list.getQuery()
-      }
+      activeName: 'CorpInfo',
+      HIGHWORK_ID: '',
+      ticketType : '',
+      CUTROAD_ID:''
     }
   }
 }
diff --git a/src/views/dangerousWork/hoisting/components/corpInfo.vue b/src/views/dangerousWork/hoisting/components/corpInfo.vue
index 6d0d7d4..ddf3ce4 100644
--- a/src/views/dangerousWork/hoisting/components/corpInfo.vue
+++ b/src/views/dangerousWork/hoisting/components/corpInfo.vue
@@ -102,7 +102,7 @@ export default {
       this.$parent.activeName = tableName
       this.$parent.CORPINFO_ID = CORPINFO_ID
       this.$parent.ticketType = ticketType
-      this.$parent.CUTROAD_ID =''
+      this.$parent.HOISTING_ID =''
     },
     getList() {
       return new Promise((resolve) => {
diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue
index c5f6c07..9ad8bc0 100644
--- a/src/views/dangerousWork/hoisting/components/list.vue
+++ b/src/views/dangerousWork/hoisting/components/list.vue
@@ -132,7 +132,13 @@
         <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>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
@@ -211,7 +217,9 @@ export default {
         '/dangerousWork/gfHoisting/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
@@ -324,8 +332,12 @@ export default {
       }
     },
     goDetail(id) {
-      this.$parent.activeName = 'Hoisting'
+      this.$parent.activeName = 'Detail'
       this.$parent.HOISTING_ID = id
+    },
+    goBack(){
+      this.$parent.activeName = 'CorpInfo'
+      this.$parent.HOISTING_ID = ''
     }
   }
 }
diff --git a/src/views/dangerousWork/hoisting/index.vue b/src/views/dangerousWork/hoisting/index.vue
index fe80378..07fac1c 100644
--- a/src/views/dangerousWork/hoisting/index.vue
+++ b/src/views/dangerousWork/hoisting/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <CorpInfo v-show="activeName=='CorpInfo'" ref="list" />
-    <List v-show="activeName=='hoisting_list'" />
+    <List v-if="activeName=='hoisting_list'" />
     <Detail v-if="activeName=='Detail'"/>
   </div>
 </template>
@@ -15,7 +15,9 @@ export default {
   data() {
     return {
       activeName: 'CorpInfo',
-      HOISTING_ID: ''
+      HOISTING_ID: '',
+      ticketType : '',
+      CORPINFO_ID : ''
     }
   },
   watch: {