From 1fc75b9d565b11ae646814aa27ebbe4da75ce117 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 14 May 2024 18:43:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=A1=B5=E9=9D=A2=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E5=AD=90=E9=A1=B5=E9=9D=A2=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/aiwarning/components/record-list.vue  | 5 +++++
 src/views/keyprojects/inspection/components/record-list.vue | 5 +++++
 src/views/keyprojects/punish/components/list2.vue           | 5 +++++
 .../keyprojects/videomanager/components/video-list.vue      | 6 +++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/views/keyprojects/aiwarning/components/record-list.vue b/src/views/keyprojects/aiwarning/components/record-list.vue
index 0a1451a..a415cc6 100644
--- a/src/views/keyprojects/aiwarning/components/record-list.vue
+++ b/src/views/keyprojects/aiwarning/components/record-list.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="app-container">
+      <el-page-header content="报警记录" @back="back"/>
       <el-form label-width="100px">
         <el-row>
           <el-col :span="5">
@@ -116,6 +117,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'List'
+    },
     checkboxInit(row, index) {
       if (row.STATUS != '0') {
         return 0 // 不可勾选
diff --git a/src/views/keyprojects/inspection/components/record-list.vue b/src/views/keyprojects/inspection/components/record-list.vue
index c30941c..bd058f9 100644
--- a/src/views/keyprojects/inspection/components/record-list.vue
+++ b/src/views/keyprojects/inspection/components/record-list.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header @back="back"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="5">
@@ -98,6 +99,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'list'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
diff --git a/src/views/keyprojects/punish/components/list2.vue b/src/views/keyprojects/punish/components/list2.vue
index 93cb6c8..f1f4fad 100644
--- a/src/views/keyprojects/punish/components/list2.vue
+++ b/src/views/keyprojects/punish/components/list2.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header content="处罚记录" @back="back"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="4">
@@ -96,6 +97,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'List'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index db0ad9e..80881f7 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header content="视频详情" @back="goBack"/>
     <div class="filter-container">
       <el-form label-width="100px">
         <el-row>
@@ -564,7 +565,10 @@ export default {
         this.listLoading = false
       })
     },
-
+    goBack() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'list'
+    },
     // 保存
     upload() {
       this.$refs.form.validate(valid => {

From f5053e2200809e738049386672367b0db652a6f7 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Wed, 15 May 2024 11:00:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B6=85=E6=9C=9F?=
 =?UTF-8?q?=E6=9C=AA=E5=8A=A8=E7=81=AB=EF=BC=8C=E5=8A=A8=E7=81=AB=E5=90=8E?=
 =?UTF-8?q?=E6=9C=AA=E7=AD=BE=E5=AD=97=EF=BC=8C=E4=BD=86=E5=8D=B4=E6=9C=89?=
 =?UTF-8?q?=E4=B8=AA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/hotwork/hotwork_list/components/detail.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue
index 60ebccb..6e893f6 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue
@@ -114,8 +114,8 @@
               </td>
             </tr>
             <tr>
-              <td colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
-              <td colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_PERSON_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_AFTER_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
             </tr>
             <tr>
               <td class="tbg">延时监火记录</td>

From 2db2046f6e315bdb8fcbcf319defe23c9e775f05 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 15 May 2024 11:25:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?=
 =?UTF-8?q?=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86=E4=B8=AD=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E2=80=9C=E5=A4=84=E7=BD=9A=E5=A4=84=E7=90=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E2=80=9D=E6=97=A0=E6=95=88=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/punish/components/list.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/keyprojects/punish/components/list.vue b/src/views/keyprojects/punish/components/list.vue
index cfd86b6..fecbe8a 100644
--- a/src/views/keyprojects/punish/components/list.vue
+++ b/src/views/keyprojects/punish/components/list.vue
@@ -56,11 +56,6 @@
       <el-table-column v-if="false" prop="CREATOR_NAME" label="下发人" show-overflow-tooltip/>
       <el-table-column v-if="false" prop="OUTSOURCED_NAME" label="被处罚单位" show-overflow-tooltip/>
       <el-table-column v-if="false" prop="PERSON_NAME" label="被处罚人" show-overflow-tooltip/>
-      <el-table-column label="处罚处理状态" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ row.HANDLED === "0" ? "待处理" : "已处理" }}
-        </template>
-      </el-table-column>
       <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip/>
       <el-table-column prop="FIND_HIDDEN_NUM" label="发现隐患数据" show-overflow-tooltip/>
       <el-table-column prop="END_HIDDEN_NUM" label="处理隐患数" show-overflow-tooltip/>

From 19bd9b1ab286b376ef378c5d219f21b740c4446f Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 15 May 2024 14:16:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84-=E5=88=86=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D=E5=A5=96=E6=83=A9=E7=9A=84?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=92=8C=E7=9B=91=E7=AE=A1=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E5=88=97=EF=BC=8C=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=80=E5=88=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../branch_hazard_assessment/components/list.vue         | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
index 70c0aa6..9f169ae 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
@@ -50,14 +50,9 @@
           {{ row.checked_count1 }} / {{ row.count1 }}
         </template>
       </el-table-column>
-      <el-table-column label="重点工程安全环保奖惩监管端">
+      <el-table-column label="重点工程安全环保奖惩">
         <template slot-scope="{row}">
-          {{ row.checked_count2 }} / {{ row.count2 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="重点工程安全环保奖惩企业端">
-        <template slot-scope="{row}">
-          {{ row.checked_count3 }} / {{ row.count3 }}
+          {{row.CORP_NAME == '秦港股份有限公司' ? row.checked_count2 : row.checked_count3 }} / {{row.CORP_NAME == '秦港股份有限公司' ? row.count2 : row.checked_count3 }}
         </template>
       </el-table-column>
       <el-table-column prop="CHECK_USER" label="考评组成员"/>