From b71e1891f1ded7b21bbc814b8769e4e53eaad3c4 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, 24 Jun 2026 16:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=BE=A8=E8=AF=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=AF=BC=E5=85=A5=E4=BC=81=E4=B8=9A=E5=BA=93=E5=B8=A6?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/files/edit/SK035.js | 40 +++++++++++++++++++++++++++++++++++++++-
 src/files/list/SK066.js |  3 ++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/files/edit/SK035.js b/src/files/edit/SK035.js
index 9f1e297..fdb7c33 100644
--- a/src/files/edit/SK035.js
+++ b/src/files/edit/SK035.js
@@ -36,6 +36,33 @@ export default {
     if(login.tempDatas && login.tempDatas.length>0)
      {
       login.tempDatas.map(item=>{
+        let mesList=[]
+        item.Nav_Details.map(t=>{
+          let mes={
+            NUM:t.NUM,
+            MEASURE:t.MEASURES_NAME
+          }
+          mesList.push(mes)
+        })
+        let postList=[]
+        item.Nav_Posts.map(t=>{
+          
+          let poList=[]
+          t.Nav_PostDetails.map(pot=>{
+            let po={
+              POST_ID:pot.POST_ID,
+              Nav_Post:pot.Nav_Post
+            }
+            poList.push(po)
+          })
+          let dep={
+            DEPARTMENT_ID:t.DEPARTMENT_ID,
+            Nav_Department:t.Nav_Department,
+            DEPARTMENT_TYPE:t.Nav_Department?.DEPARTMENT_TYPE,
+            Nav_ResultPostDets:poList
+          }
+          postList.push(dep)
+        })
         let tmpData = {
           ID:guid(),
           MineType: item.MineType,
@@ -56,10 +83,21 @@ export default {
           Nav_ProductionUnit:item.Nav_ProductionUnit,
           MARK:item.MARK,
           ENABLE_STATUS:item.ENABLE_STATUS,
+          Nav_DetailMeasures:mesList.sort((x, y) => x.NUM > y.NUM ? 1 : -1),
+          Nav_DetailPosts:postList
         }
         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
         {
diff --git a/src/files/list/SK066.js b/src/files/list/SK066.js
index 636c78a..d99aba3 100644
--- a/src/files/list/SK066.js
+++ b/src/files/list/SK066.js
@@ -42,7 +42,8 @@ export default {
           MARK:10,
           ENABLE_STATUS:0,
           Nav_ProductionUnit:item.Nav_ProductionUnit,
-          Nav_Details:item.Nav_Details
+          Nav_Details:item.Nav_Details,
+          Nav_Posts:item.Nav_Posts,
         }
         temps.push(tmpData);
       });