From af4ceaf59367fc23589fb40151f9d9de7b11717a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 22 Oct 2025 17:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomPages/SK/SK033ShowPrint.js          | 20 +++++------
 src/files/edit/SK033.js                       | 36 +++++++++++++------
 src/files/list/SK066.js                       |  6 ++++
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js
index 012d016..8082092 100644
--- a/src/components/CustomPages/SK/SK033ShowPrint.js
+++ b/src/components/CustomPages/SK/SK033ShowPrint.js
@@ -69,7 +69,7 @@ class SK033ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    this.onClickApprove(true);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -127,15 +127,15 @@ class SK033ShowPrint extends React.Component {
                 }
                 <table style={{ tableLayout: 'fixed', width: '100%' }} className={stylesStep.PrintForm1}>
                     <tr>
-                        <td className={stylesStep.fontBold}>序号</td>
-                        <td className={stylesStep.fontBold}>生产单元</td>
-                        <td className={stylesStep.fontBold}>辨识区域</td>
-                        <td className={stylesStep.fontBold}>风险名称</td>
+                        <td style={{ width: "50px" }} className={stylesStep.fontBold}>序号</td>
+                        <td style={{ width: "80px" }} className={stylesStep.fontBold}>生产单元</td>
+                        <td style={{ width: "80px" }} className={stylesStep.fontBold}>辨识区域</td>
+                        <td style={{ width: "80px" }} className={stylesStep.fontBold}>风险名称</td>
                         <td className={stylesStep.fontBold}>风险描述</td>
-                        <td className={stylesStep.fontBold}>风险类别</td>
-                        <td style={{ width: "200px" }} className={stylesStep.fontBold}>管控措施</td>
-                        <td style={{ width: "200px" }} className={stylesStep.fontBold}>应急处置</td>
-                        <td className={stylesStep.fontBold}>状态</td>
+                        <td style={{ width: "80px" }} className={stylesStep.fontBold}>风险类别</td>
+                        <td className={stylesStep.fontBold}>管控措施</td>
+                        <td className={stylesStep.fontBold}>应急处置</td>
+                        <td style={{ width: "50px" }}  className={stylesStep.fontBold}>状态</td>
                     </tr>
                     {
                         data?.Nav_Details && data.Nav_Details?.map((item, i) => {
@@ -185,7 +185,7 @@ class SK033ShowPrint extends React.Component {
                      <div>
                         <Descriptions size="middle" bordered>
                         <Descriptions.Item label="辨识人签名">{
-                                data.STATUS === 30 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
+                                data.STATUS !== 0 ? showUserSign(data.Nav_ApplyUser, config.picServerHost) : null
                             }</Descriptions.Item>
                         </Descriptions>
                      </div>:null
diff --git a/src/files/edit/SK033.js b/src/files/edit/SK033.js
index a334f6d..7b7f2a3 100644
--- a/src/files/edit/SK033.js
+++ b/src/files/edit/SK033.js
@@ -75,19 +75,33 @@ export default {
           ID:guid(),
           MineType: item.MineType,
           AREA_ID: item.AREA_ID,
+          PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
           TYPE_ID: item.TYPE_ID,
           RISK_NAME_ID: item.RISK_NAME_ID,
           RISK_NAME: item.RISK_NAME,
           RISK_DESCRIPTION: item.RISK_DESCRIPTION,
-          MEASURE: item.MEASURE,
+          MEASURE: item.MINE_NAME,
           EMERGENCY: item.EMERGENCY,
           Nav_Area: item.Nav_Area,
           Nav_Type: item.Nav_Type,
           Nav_RiskName: item.Nav_RiskName,
+          EVALUATE_LEVEL:item.EVALUATE_LEVEL,
+          MARK:0,
+          ENABLE_STATUS:0,
+          Nav_ProductionUnit: item.Nav_ProductionUnit,
         }
         if(stateData && stateData.Nav_Details)
         {
-          stateData.Nav_Details.push(tmpData);
+          let temp=stateData.Nav_Details.filter(m=>m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME);
+          if(temp.length === 0)
+          {
+            stateData.Nav_Details.push(tmpData)
+          }
+          else
+          {
+            message.error('生产单元、辨识区域、风险名称已存在，请勿重复导入');
+            return;
+          }
         }
         else
         {
@@ -96,15 +110,15 @@ export default {
       });
       if(temps && temps.length>0)
       {
-        temps.map(t=>{
-          let temp=stateData.Nav_Details.filter(m=>m.AREA_ID == t.AREA_ID && m.MineType == t.MineType && m.RISK_NAME == t.RISK_NAME && m.RISK_DESCRIPTION == t.RISK_DESCRIPTION);
-          if(temp)
-          {
-            message.error('导入内容已存在，请核对');
-            return;
-          }
-        })
-        stateData.Nav_Details = temps;
+          let tempOlds=[]
+          temps.map(t=>{
+            let temp = tempOlds.filter(m=>m.AREA_ID == t.AREA_ID && m.PRODUCTION_UNIT_ID == t.PRODUCTION_UNIT_ID && m.RISK_NAME == t.RISK_NAME);
+            if(temp.length === 0)
+            {
+              tempOlds.push(t)
+            }
+          })
+          stateData.Nav_Details = tempOlds;
       }
       login.tempDatas =null;
       close();
diff --git a/src/files/list/SK066.js b/src/files/list/SK066.js
index 02845c3..63126a8 100644
--- a/src/files/list/SK066.js
+++ b/src/files/list/SK066.js
@@ -18,6 +18,7 @@ export default {
           MineType: item.MineType,
           AREA_ID: item.AREA_ID,
           TYPE_ID: item.TYPE_ID,
+          PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
           RISK_NAME_ID: item.RISK_NAME_ID,
           RISK_NAME: item.RISK_NAME,
           RISK_DESCRIPTION: item.RISK_DESCRIPTION,
@@ -25,6 +26,7 @@ export default {
           CHECKDEPT: item.CHECKDEPT,
           CHECKPOST: item.CHECKPOST,
           MEASURE: item.MEASURE,
+          MINE_NAME:item.MINE_NAME,
           EMERGENCY: item.EMERGENCY,
           Nav_Area: item.Nav_Area,
           Nav_Type: item.Nav_Type,
@@ -36,6 +38,10 @@ export default {
           Nav_SCOREL:item.Nav_SCOREL,
           Nav_SCOREE:item.Nav_SCOREE,
           Nav_SCOREC:item.Nav_SCOREC,
+          EVALUATE_LEVEL:item.EVALUATE_LEVEL,
+          MARK:0,
+          ENABLE_STATUS:0,
+          Nav_ProductionUnit:item.Nav_ProductionUnit
         }
         temps.push(tmpData);
       });