From d56ad5a3f6111619231cb1581395e63df3dc6647 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 2 Jul 2024 09:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=8C=83=E5=9B=B4=20?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=20home=20=E4=BF=A1=E6=81=AF=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/BS/BS026ShowPrint.js | 2 +-
 src/components/CustomPages/BS/BS032ShowPrint.js | 2 +-
 src/components/CustomPages/BS/BS034ShowPrint.js | 2 +-
 src/components/CustomPages/BS/BS034View.js      | 2 +-
 src/components/CustomPages/BS/BS048ShowPrint.js | 2 +-
 src/components/CustomPages/BS/BS070ShowPrint.js | 2 +-
 src/components/CustomPages/BS/BS073ShowPrint.js | 2 +-
 src/routes/Home.js                              | 6 ++++--
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/CustomPages/BS/BS026ShowPrint.js b/src/components/CustomPages/BS/BS026ShowPrint.js
index 1bb562f..6070542 100644
--- a/src/components/CustomPages/BS/BS026ShowPrint.js
+++ b/src/components/CustomPages/BS/BS026ShowPrint.js
@@ -131,7 +131,7 @@ class BS026ShowPrint extends React.Component {
                     // paddingLeft: '50px'
                     data ? <div>
                         <Descriptions title="" size="middle" bordered>
-                            <Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item> */}
                             <Descriptions.Item label="检查类型">{data.Nav_CheckType?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel?.Nav_Enums.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>
diff --git a/src/components/CustomPages/BS/BS032ShowPrint.js b/src/components/CustomPages/BS/BS032ShowPrint.js
index 742277d..4b6b57d 100644
--- a/src/components/CustomPages/BS/BS032ShowPrint.js
+++ b/src/components/CustomPages/BS/BS032ShowPrint.js
@@ -197,7 +197,7 @@ class BS032ShowPrint extends React.Component {
                             <Descriptions.Item span={2} label="安全检查名称">{data.NAME}</Descriptions.Item>
                             <Descriptions.Item span={2} label="安全检查编号">{data.CODE}</Descriptions.Item>
                             <Descriptions.Item span={2} label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>
-                            <Descriptions.Item span={2} label="检查范围">{enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item>
+                            {/* <Descriptions.Item span={2} label="检查范围">{enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item> */}
                             <Descriptions.Item span={2} label="检查层级">{levelNameShow}</Descriptions.Item>
                             {/* data.Nav_CheckTypeLevel.Nav_Enums.NAME */}
                             <Descriptions.Item span={2} label="检查时间">{data.CHECKTIME}</Descriptions.Item>
diff --git a/src/components/CustomPages/BS/BS034ShowPrint.js b/src/components/CustomPages/BS/BS034ShowPrint.js
index 42f7245..69c6a96 100644
--- a/src/components/CustomPages/BS/BS034ShowPrint.js
+++ b/src/components/CustomPages/BS/BS034ShowPrint.js
@@ -152,7 +152,7 @@ class BS034ShowPrint extends React.Component {
                             <Descriptions.Item label="安全检查名称">{data.NAME?.replace('任务表', '记录表')}</Descriptions.Item>
                             <Descriptions.Item label="安全检查编号">{data.CODE}</Descriptions.Item>
                             <Descriptions.Item label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>
-                            <Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item> */}
                             <Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel.Nav_Enums.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查时间">{data.CHECKTIME}</Descriptions.Item>
                             <Descriptions.Item label="检查区域">{data.RiskAreaNAME}</Descriptions.Item>
diff --git a/src/components/CustomPages/BS/BS034View.js b/src/components/CustomPages/BS/BS034View.js
index 5e1b45c..8f608c9 100644
--- a/src/components/CustomPages/BS/BS034View.js
+++ b/src/components/CustomPages/BS/BS034View.js
@@ -184,7 +184,7 @@ class BS034View extends React.Component {
                             <Descriptions.Item span={2} label="安全检查名称">{data.NAME?.replace('任务表', '记录表')}</Descriptions.Item>
                             <Descriptions.Item span={2} label="安全检查编号">{data.CODE}</Descriptions.Item>
                             <Descriptions.Item span={2} label="检查类型">{data.Nav_CheckType.NAME}</Descriptions.Item>
-                            <Descriptions.Item span={2} label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item>
+                            {/* <Descriptions.Item span={2} label="检查范围">{data.CHECKOBJECT_DESCRIPTION}</Descriptions.Item> */}
                             <Descriptions.Item span={2} label="检查层级">{data.Nav_CheckTypeLevel.Nav_Enums.NAME}</Descriptions.Item>
                             <Descriptions.Item span={2} label="检查时间">{data.CHECKTIME}</Descriptions.Item>
                             <Descriptions.Item span={2} label="检查区域">{
diff --git a/src/components/CustomPages/BS/BS048ShowPrint.js b/src/components/CustomPages/BS/BS048ShowPrint.js
index 75c1933..8a074d8 100644
--- a/src/components/CustomPages/BS/BS048ShowPrint.js
+++ b/src/components/CustomPages/BS/BS048ShowPrint.js
@@ -92,7 +92,7 @@ class BS048ShowPrint extends React.Component {
                     //, paddingLeft: '50px'
                     data ? <div>
                         <Descriptions title="" size="middle" bordered>
-                            <Descriptions.Item label="检查范围">{this.props.app.enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查范围">{this.props.app.enums.BSMineTypeEnum.enums[data.CHECKOBJECT]}</Descriptions.Item> */}
                             <Descriptions.Item label="检查项目">{data.Nav_CheckProject.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查问题描述">{data.DESCREPTION}</Descriptions.Item>
 
diff --git a/src/components/CustomPages/BS/BS070ShowPrint.js b/src/components/CustomPages/BS/BS070ShowPrint.js
index bb7cc65..6a10a32 100644
--- a/src/components/CustomPages/BS/BS070ShowPrint.js
+++ b/src/components/CustomPages/BS/BS070ShowPrint.js
@@ -118,7 +118,7 @@ class BS070ShowPrint extends React.Component {
                 {
                     Nav_SafeCheck ? <div>
                         <Descriptions title="" size="middle" bordered>
-                            <Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[Nav_SafeCheck.CHECKOBJECT]}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[Nav_SafeCheck.CHECKOBJECT]}</Descriptions.Item> */}
                             <Descriptions.Item label="检查类型">{Nav_SafeCheck?.Nav_CheckType?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查层级">{Nav_SafeCheck?.Nav_CheckTypeLevel?.Nav_Enums?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查区域"><p >{
diff --git a/src/components/CustomPages/BS/BS073ShowPrint.js b/src/components/CustomPages/BS/BS073ShowPrint.js
index a992d5c..e25021d 100644
--- a/src/components/CustomPages/BS/BS073ShowPrint.js
+++ b/src/components/CustomPages/BS/BS073ShowPrint.js
@@ -119,7 +119,7 @@ class BS073ShowPrint extends React.Component {
                 {
                     data ? <div >
                         <Descriptions title="" size="middle" bordered>
-                            <Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[data.Nav_Submit?.CHECKOBJECT]}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查范围">{enums.BSMineTypeEnum.enums[data.Nav_Submit?.CHECKOBJECT]}</Descriptions.Item> */}
                             <Descriptions.Item label="检查类型">{data.Nav_Submit?.Nav_CheckType?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查层级">{data.Nav_Submit?.Nav_CheckTypeLevel?.Nav_Enums?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="提交人">{data.Nav_Submit?.Nav_User?.NAME}</Descriptions.Item>
diff --git a/src/routes/Home.js b/src/routes/Home.js
index efc22e7..38e467c 100644
--- a/src/routes/Home.js
+++ b/src/routes/Home.js
@@ -650,8 +650,10 @@ class Home extends React.Component {
   };
   clearData = () => {
     let newtmpData = { ...this.state.tmpData };
-    newtmpData["data"].id = "";
-    newtmpData["data"].homeReload = false;
+    if (newtmpData["data"] != null) {
+      newtmpData["data"].id = "";
+      newtmpData["data"].homeReload = false;
+    }
     newtmpData.formCode = "";
     this.setState({
       formVisible: false,