From 7a6b1a7804cdcbb71ce45205e77bbe2e37836be7 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 16 Jul 2024 15:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=8A=A0=E7=B2=97=20=E5=8F=98=E7=BA=A2=20=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=20=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/baseComponents/EditBaseComponent/index.js |  4 ++-
 src/baseComponents/EditComponent/index.js     |  2 +-
 .../CustomPages/BS/BS026ShowPrint.js          |  2 +-
 .../CustomPages/BS/BS032ShowPrint.js          |  7 ++--
 .../CustomPages/BS/BS034ShowPrint.js          | 23 +++++--------
 src/components/CustomPages/BS/BS034View.js    |  7 ++--
 .../CustomPages/BS/BS073ShowPrint.js          |  4 +--
 .../CustomPages/BS/BS076ShowOperateLog.js     | 32 +++++++++----------
 src/files/edit/BS032.js                       | 17 +++++-----
 9 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/src/baseComponents/EditBaseComponent/index.js b/src/baseComponents/EditBaseComponent/index.js
index 4876467..fa7cd07 100644
--- a/src/baseComponents/EditBaseComponent/index.js
+++ b/src/baseComponents/EditBaseComponent/index.js
@@ -748,7 +748,9 @@ params【字段属性】=值
             <Form.Item
               label={
                 <span>
-                  <span>{label}</span>
+                  {
+                    (col.code&&col.code === 'warm') ? (<span style={{ color: 'red',fontWeight:'bold',fontSize: 'large' }} >{label}</span>):(<span >{label}</span>) 
+                  }
                   {
                     remark
                       ? (
diff --git a/src/baseComponents/EditComponent/index.js b/src/baseComponents/EditComponent/index.js
index 3b1f174..3f8a49d 100644
--- a/src/baseComponents/EditComponent/index.js
+++ b/src/baseComponents/EditComponent/index.js
@@ -1788,7 +1788,7 @@ class EditComponent extends EditBaseComponent {
     const tempCols = [];
     if (columns && columns.length) {
       columns.forEach(t => {
-        if (code && t.code === code || !code & !t.code) {
+        if ((code && t.code === code || !code & !t.code) || (t.code && t.code === 'warm')) {
           tempCols.push(t);
         }
         if (isTree) t.span = { sm: 24, md: 12 }
diff --git a/src/components/CustomPages/BS/BS026ShowPrint.js b/src/components/CustomPages/BS/BS026ShowPrint.js
index 6070542..6e53b58 100644
--- a/src/components/CustomPages/BS/BS026ShowPrint.js
+++ b/src/components/CustomPages/BS/BS026ShowPrint.js
@@ -136,7 +136,7 @@ class BS026ShowPrint extends React.Component {
                             <Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel?.Nav_Enums.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item>
-                            <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item> */}
                             <Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item>
                             {/* <Descriptions.Item label="检查依据">{data.CHECKPROOF}</Descriptions.Item> */}
                             <Descriptions.Item label="检查问题描述">{data.Nav_CheckQuestion?.DESCREPTION}</Descriptions.Item>
diff --git a/src/components/CustomPages/BS/BS032ShowPrint.js b/src/components/CustomPages/BS/BS032ShowPrint.js
index 4b6b57d..e20ee04 100644
--- a/src/components/CustomPages/BS/BS032ShowPrint.js
+++ b/src/components/CustomPages/BS/BS032ShowPrint.js
@@ -74,7 +74,7 @@ class BS032ShowPrint extends React.Component {
         extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
         extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
         extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
-        extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
+        // extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
         // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckProject');
         // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_ListCheckDetailUser.Nav_User');
         extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
@@ -215,12 +215,11 @@ class BS032ShowPrint extends React.Component {
 
                             }</Descriptions.Item>
                             {/* ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME */}
-                            <Descriptions.Item span={2} label="检查项目分类">{
+                            {/* <Descriptions.Item span={2} label="检查项目分类">{
                                 data.Nav_ListCheckProjectCategory && data.Nav_ListCheckProjectCategory.map((item, i) => {
-                                    // return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME
                                     return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p>
                                 })
-                            }</Descriptions.Item>
+                            }</Descriptions.Item> */}
                             <Descriptions.Item span={2} label="检查人员">{data.CheckUsers}</Descriptions.Item>
                             <Descriptions.Item span={2} label="附件">{
                                 data.Nav_Files && data.Nav_Files.map((item, i) => {
diff --git a/src/components/CustomPages/BS/BS034ShowPrint.js b/src/components/CustomPages/BS/BS034ShowPrint.js
index 69c6a96..ac3fa3d 100644
--- a/src/components/CustomPages/BS/BS034ShowPrint.js
+++ b/src/components/CustomPages/BS/BS034ShowPrint.js
@@ -43,17 +43,11 @@ class BS034ShowPrint extends React.Component {
         let json = initFilter(this.props.login.OrgId);
         extendRule(json, 'ID', 1, this.props.data.id);
 
-        // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckMain');
-        // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckMain.Nav_CheckProject');
-        // extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_CheckMain.Nav_CheckQuestion');
-        // extendInclude(json, 'Nav_ListCheckUserSign.Nav_ImgFile.Nav_File');
-        //extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_ListCheckDetailUser.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
-
         extendInclude(json, 'Nav_CheckType');
         extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
         extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
         extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
-        extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
+        // extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
         extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_ListCheckUserSign.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_ApproveCheckAudit.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
@@ -80,11 +74,11 @@ class BS034ShowPrint extends React.Component {
                     }
 
                     let strProjectCategoryNAME = ''
-                    if (ret.Nav_ListCheckProjectCategory && ret.Nav_ListCheckProjectCategory.length > 0) {
-                        for (let i = 0; i < ret.Nav_ListCheckProjectCategory.length; i++) {
-                            strProjectCategoryNAME += (strProjectCategoryNAME.length > 0 ? "," : "") + ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
-                        }
-                    }
+                    // if (ret.Nav_ListCheckProjectCategory && ret.Nav_ListCheckProjectCategory.length > 0) {
+                    //     for (let i = 0; i < ret.Nav_ListCheckProjectCategory.length; i++) {
+                    //         strProjectCategoryNAME += (strProjectCategoryNAME.length > 0 ? "," : "") + ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
+                    //     }
+                    // }
 
                     ret.RiskAreaNAME = strRiskAreaNAME
                     ret.CheckProjectNAME = strCheckProjectNAME
@@ -158,12 +152,11 @@ class BS034ShowPrint extends React.Component {
                             <Descriptions.Item label="检查区域">{data.RiskAreaNAME}</Descriptions.Item>
                             <Descriptions.Item label="检查项目">{data.CheckProjectNAME}</Descriptions.Item>
                             {/* ret.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME */}
-                            <Descriptions.Item label="检查项目分类">{
-                                // data.ProjectCategoryNAME
+                            {/* <Descriptions.Item label="检查项目分类">{
                                 data.Nav_ListCheckProjectCategory && data.Nav_ListCheckProjectCategory.map((item, i) => {
                                     return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME
                                 })
-                            }</Descriptions.Item>
+                            }</Descriptions.Item> */}
                             <Descriptions.Item label="检查人员">{data.CheckUsers}</Descriptions.Item>
                             <Descriptions.Item label="附件">{
                                 showFiles(data.Nav_Files, config.picServerHost)
diff --git a/src/components/CustomPages/BS/BS034View.js b/src/components/CustomPages/BS/BS034View.js
index 8f608c9..73ef1f5 100644
--- a/src/components/CustomPages/BS/BS034View.js
+++ b/src/components/CustomPages/BS/BS034View.js
@@ -47,7 +47,7 @@ class BS034View extends React.Component {
         extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
         extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
         extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
-        extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
+        // extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
         extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_ListCheckUserSign.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_ListSafeCheckDetail.Nav_Files.Nav_ImgFile.Nav_File');
@@ -199,12 +199,11 @@ class BS034View extends React.Component {
                                     return <p className={styles.pLin}> {item.Nav_CheckProject.NAME}</p>
                                 })
                             }</Descriptions.Item>
-                            <Descriptions.Item span={2} label="检查项目分类">{
+                            {/* <Descriptions.Item span={2} label="检查项目分类">{
                                 data?.Nav_ListCheckProjectCategory?.map((item, i) => {
-                                    // return (i > 0 ? "," : "") + item.Nav_CheckProjectCategory.NAME
                                     return <p className={styles.pLin}> {item.Nav_CheckProjectCategory.NAME}</p>
                                 })
-                            }</Descriptions.Item>
+                            }</Descriptions.Item> */}
                             <Descriptions.Item span={2} label="检查人员">{data.CheckUsers}</Descriptions.Item>
                             <Descriptions.Item span={2} label="附件">{
                                 showFiles(data.Nav_Files, config.picServerHost)
diff --git a/src/components/CustomPages/BS/BS073ShowPrint.js b/src/components/CustomPages/BS/BS073ShowPrint.js
index e25021d..7ed2607 100644
--- a/src/components/CustomPages/BS/BS073ShowPrint.js
+++ b/src/components/CustomPages/BS/BS073ShowPrint.js
@@ -49,7 +49,7 @@ class BS073ShowPrint extends React.Component {
         extendInclude(json, 'Nav_Submit');
         extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_CheckProject');
-        extendInclude(json, 'Nav_CheckProjectCategory');
+        // extendInclude(json, 'Nav_CheckProjectCategory');
         extendInclude(json, 'Nav_RiskArea');
         extendInclude(json, 'Nav_ListRiskQuestionReason.Nav_RiskReason');
         extendInclude(json, 'Nav_ListRiskQuestionReason');
@@ -129,7 +129,7 @@ class BS073ShowPrint extends React.Component {
                                 showFiles(data?.Nav_Files, config.picServerHost)
                             }</Descriptions.Item>
                             <Descriptions.Item label="检查项目">{data.Nav_CheckProject?.NAME}</Descriptions.Item>
-                            <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item>
+                            {/* <Descriptions.Item label="检查项目分类">{data.Nav_CheckProjectCategory?.NAME}</Descriptions.Item> */}
                             <Descriptions.Item label="检查区域">{data.Nav_RiskArea?.NAME}</Descriptions.Item>
                             <Descriptions.Item label="隐患地点">{data.ADDRESS}</Descriptions.Item>
                             <Descriptions.Item label="检查内容">{data.CHECKCONTENT}</Descriptions.Item>
diff --git a/src/components/CustomPages/BS/BS076ShowOperateLog.js b/src/components/CustomPages/BS/BS076ShowOperateLog.js
index 12408c6..437aca1 100644
--- a/src/components/CustomPages/BS/BS076ShowOperateLog.js
+++ b/src/components/CustomPages/BS/BS076ShowOperateLog.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, ShowDateTime, ShowPrintClose, showFiles } from '../../../utils/common';
+import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, ShowDateTime } from '../../../utils/common';
 import ReactToPrint from 'react-to-print';
 import { ExportToExcel } from '@woowalker/feui'
 import XLSX from 'xlsx';
@@ -119,7 +119,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepx} id="step01">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step02" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>
                                                                 )
@@ -129,7 +129,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepxOutTime} id="step01">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step02" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>)
                                                         )
@@ -190,7 +190,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepx} id="step20">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step21" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>
                                                                 )
@@ -200,7 +200,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepxOutTime} id="step20">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step21" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>)
                                                         )
@@ -261,7 +261,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepx} id="step30">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step31" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>
                                                                 )
@@ -271,7 +271,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepxOutTime} id="step30">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step31" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>)
                                                         )
@@ -319,7 +319,7 @@ class BS076ShowOperateLog extends React.Component {
                             }
                         </td>
                         <td colSpan={10}
-                            style={{ padding:"0 30px 0 30px", border: "1px dashed #D9D9D9" }}>
+                            style={{ padding: "0 30px 0 30px", border: "1px dashed #D9D9D9" }}>
                             <div className={styles.flowchartx} >
                                 {
                                     data && data[3]?.map((item, index) => {
@@ -336,7 +336,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepx} id="step40">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step41" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>
                                                                 )
@@ -346,7 +346,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                         <div className={styles.stepxOutTime} id="step40">{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                         <div id="step41" className={styles.discribeSpan}>
                                                                             <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                            <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                            <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                         </div>
                                                                     </div>)
                                                         )
@@ -385,7 +385,7 @@ class BS076ShowOperateLog extends React.Component {
                     {
                         dataRiskMore?.map(itemR => {
                             return <tr>
-                                <td colSpan={10} style={{ padding:"0 30px 0 30px", border: "1px dashed #D9D9D9" }}>
+                                <td colSpan={10} style={{ padding: "0 30px 0 30px", border: "1px dashed #D9D9D9" }}>
                                     <div className={styles.flowchartx} >
                                         {
                                             itemR.map((item, index) => {
@@ -402,7 +402,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                                 <div className={styles.stepx} id={"step50" + index}>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                                 <div id={"step51" + index} className={styles.discribeSpan}>
                                                                                     <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                                    <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                                    <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                                 </div>
                                                                             </div>
                                                                         )
@@ -412,7 +412,7 @@ class BS076ShowOperateLog extends React.Component {
                                                                                 <div className={styles.stepxOutTime} id={"step50" + index}>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]}</div>
                                                                                 <div id={"step51" + index} className={styles.discribeSpan}>
                                                                                     <span className={styles.discribeSpanUser}> 用户：{item.USRTNAME}</span>
-                                                                                    <span className={styles.discribeSpanTime}> 时间：{item.CREATE_TIME.split(' ')[0]}</span>
+                                                                                    <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(item.OPERTETIME, "MM-dd HH:mm")}</span>
                                                                                 </div>
                                                                             </div>)
                                                                 )
@@ -465,7 +465,7 @@ class BS076ShowOperateLog extends React.Component {
                                             <div className={styles.stepx} id="step60">{enums.OPERATEPOINT_Enums.enums[opEnd.OPERATEPOINT]}</div>
                                             <div id="step61" className={styles.discribeSpan}>
                                                 <span className={styles.discribeSpanUser}> 用户：{opEnd.USRTNAME}</span>
-                                                <span className={styles.discribeSpanTime}> 时间：{opEnd.CREATE_TIME.split(' ')[0]}</span>
+                                                <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(opEnd.OPERTETIME, "MM-dd HH:mm")}</span>
                                             </div>
                                         </div>
                                     )
@@ -476,7 +476,7 @@ class BS076ShowOperateLog extends React.Component {
                                                 <div className={styles.stepxOutTime} id="step60">{enums.OPERATEPOINT_Enums.enums[opEnd.OPERATEPOINT]}</div>
                                                 <div id="step61" className={styles.discribeSpan}>
                                                     <span className={styles.discribeSpanUser}> 用户：{opEnd.USRTNAME}</span>
-                                                    <span className={styles.discribeSpanTime}> 时间：{opEnd.CREATE_TIME.split(' ')[0]}</span>
+                                                    <span className={styles.discribeSpanTime}> 时间：{ShowDateTime(opEnd.OPERTETIME, "MM-dd HH:mm")}</span>
                                                 </div>
                                             </div>
                                             :
@@ -557,7 +557,7 @@ class BS076ShowOperateLog extends React.Component {
                             return <tr>
                                 <td>{item.USRTNAME} </td>
                                 <td>{enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]} </td>
-                                <td>{item.CREATE_TIME} </td>
+                                <td>{item.OPERTETIME?} </td>
                                 <td>{item.OPERTETIME} </td>
                                 <td>{item.ISINTTIME != null ? (item.ISINTTIME ? '是' : '否') : ""} </td>
                             </tr>
diff --git a/src/files/edit/BS032.js b/src/files/edit/BS032.js
index 50bd40c..d0cde32 100644
--- a/src/files/edit/BS032.js
+++ b/src/files/edit/BS032.js
@@ -73,17 +73,18 @@ export default {
         }
       }
       extendRule(json, 'Parameter6', 1, ProjectIDs);
-      let valCategory = getFieldValue('Nav_ListCheckProjectCategory');
+      // let valCategory = getFieldValue('Nav_ListCheckProjectCategory');
       let ProjectCategoryIDs = ""
-      if (valCategory != undefined && valCategory.length > 0) {
-        for (let i = 0; i < valCategory.length; i++) {
-          if (valCategory[i].IS_DELETED == undefined || valCategory[i].IS_DELETED == null || valCategory[i].IS_DELETED == false)
-            ProjectCategoryIDs += (ProjectCategoryIDs.length > 0 ? "," : "") + valCategory[i].CHECK_PROJECT_CATEGORY_ID
-        }
-      }
+      // if (valCategory != undefined && valCategory.length > 0) {
+      //   for (let i = 0; i < valCategory.length; i++) {
+      //     if (valCategory[i].IS_DELETED == undefined || valCategory[i].IS_DELETED == null || valCategory[i].IS_DELETED == false)
+      //       ProjectCategoryIDs += (ProjectCategoryIDs.length > 0 ? "," : "") + valCategory[i].CHECK_PROJECT_CATEGORY_ID
+      //   }
+      // }
       extendRule(json, 'Parameter1', 1, ProjectCategoryIDs);
       extendRule(json, 'Keyword', 1, getFieldValue("ID"));
-      if (areaIDs.length > 0 && ProjectIDs.length > 0 && ProjectCategoryIDs.length > 0 && CHECK_TYPE_ID != undefined && CHECK_TYPE_ID.length > 0 && CHECK_TYPE_LEVEL_ID != undefined && CHECK_TYPE_LEVEL_ID.length > 0) {
+      // && ProjectCategoryIDs.length > 0
+      if (areaIDs.length > 0 && ProjectIDs.length > 0 && CHECK_TYPE_ID != undefined && CHECK_TYPE_ID.length > 0 && CHECK_TYPE_LEVEL_ID != undefined && CHECK_TYPE_LEVEL_ID.length > 0) {
         dispatch({
           type: 'app/getDataByPost',
           url: 'BS/BSSafeCheck/OrderPagedSafeCheckDetail',