From 6333f9a019de2db48a65e1b81d678130dbb54961 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: Tue, 30 Sep 2025 11:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E6=8E=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomPages/SK/SK002CheckList.js          |  13 ++
 .../CustomPages/SK/SK002ShowSummary.js        |  22 +--
 .../CustomPages/SK/SK004CheckPost.js          | 141 +++++++++++++----
 src/files/edit/SK004.js                       | 147 ++++++++++++++----
 src/files/list/SK066.js                       |  14 +-
 src/utils/customConfig.js                     |   5 +
 src/utils/customConfig1.js                    |   5 +
 7 files changed, 271 insertions(+), 76 deletions(-)

diff --git a/src/components/CustomPages/SK/SK002CheckList.js b/src/components/CustomPages/SK/SK002CheckList.js
index aa5528d..c2461b8 100644
--- a/src/components/CustomPages/SK/SK002CheckList.js
+++ b/src/components/CustomPages/SK/SK002CheckList.js
@@ -75,8 +75,21 @@ class SK002CheckList extends React.Component {
                 dataIndex: "DEPARTMENT_TYPE",
                 key: "DEPARTMENT_TYPE",
                 render: (text, record, index) => {
+                  if(record.DEPARTMENT_TYPE.includes('_'))
+                  {
+                    let departTypes='';debugger
+                    let departType=record.DEPARTMENT_TYPE.replace(/_/g,',').split(',').filter(Boolean);
+                    for(var i=0;i<departType.length;i++)
+                    {
+                      departTypes=departTypes+"    "+this.props.app.enums.SKDepartmentTypeEnum.enums[departType[i]]
+                    }
+                    return <label>{departTypes}</label>
+                  }
+                  else
+                  {
                     return <label>{this.props.app.enums.SKDepartmentTypeEnum.enums[record.DEPARTMENT_TYPE]}</label>
                   }
+                  }
               },
             ],
         };
diff --git a/src/components/CustomPages/SK/SK002ShowSummary.js b/src/components/CustomPages/SK/SK002ShowSummary.js
index bc47a4c..b645c0c 100644
--- a/src/components/CustomPages/SK/SK002ShowSummary.js
+++ b/src/components/CustomPages/SK/SK002ShowSummary.js
@@ -39,7 +39,7 @@ class SK002ShowSummary extends React.Component {
         // extendIgnoreDataRule(json)
     this.props.dispatch({
       type: "app/getDataByPost",
-      url: "SK/BasicLibrary/OrderEntities",
+      url: "SK/SKBasicLibrary/SKOrderEntities",
       payload: json,
       onlyData: false,
       onComplete: (ret) => {
@@ -81,7 +81,7 @@ class SK002ShowSummary extends React.Component {
                     <tr>
                         <td width='60px' textAlign='center' className={stylesStep.fontBold}>序号</td>
                         <td className={stylesStep.fontBold}>生产单元</td>
-                        <td className={stylesStep.fontBold}>辨识区域</td>
+                        {/* <td className={stylesStep.fontBold}>辨识区域</td> */}
                         <td className={stylesStep.fontBold}>风险名称</td>
                         <td className={stylesStep.fontBold}>风险描述</td>
                         <td className={stylesStep.fontBold}>风险类别</td>
@@ -94,10 +94,10 @@ class SK002ShowSummary extends React.Component {
                         <td className={stylesStep.fontBold}>管控层级</td>
                         <td className={stylesStep.fontBold}>管控措施</td>
                         <td className={stylesStep.fontBold}>检查内容</td>
-                        <td className={stylesStep.fontBold}>检查依据</td>
-                        <td className={stylesStep.fontBold}>判定标准</td>
+                        {/* <td className={stylesStep.fontBold}>检查依据</td>
+                        <td className={stylesStep.fontBold}>判定标准</td> */}
                         <td className={stylesStep.fontBold}>隐患描述</td>
-                        <td className={stylesStep.fontBold}>隐患等级</td>
+                        {/* <td className={stylesStep.fontBold}>隐患等级</td> */}
                         <td className={stylesStep.fontBold}>整改措施</td>
                     </tr>
                     {
@@ -109,9 +109,9 @@ class SK002ShowSummary extends React.Component {
                                             <td>
                                             {enums.SKProductionUnit.enums[item.MineType]}
                                             </td>
-                                            <td>
+                                            {/* <td>
                                             {item.Nav_Area?.NAME}
-                                            </td>
+                                            </td> */}
                                             <td>
                                                 {item.RISK_NAME}
                                             </td>
@@ -157,18 +157,18 @@ class SK002ShowSummary extends React.Component {
                                             <td>
                                                 { item.CHECKCONTENTS}
                                             </td>
-                                            <td>
+                                            {/* <td>
                                                 {item.CHECKBASICS }
                                             </td>
                                             <td>
                                                 { item.CHECKSTANDARDS }
-                                            </td>
+                                            </td> */}
                                             <td>
                                                 { item.HIDDENSCRIPTION }
                                             </td>
-                                            <td>
+                                            {/* <td>
                                                 { item.HIDDENLEVEL }
-                                            </td>
+                                            </td> */}
                                             <td>
                                                 {item.RECIFYMEASURE  }
                                             </td>
diff --git a/src/components/CustomPages/SK/SK004CheckPost.js b/src/components/CustomPages/SK/SK004CheckPost.js
index 995cf2b..2aa91dd 100644
--- a/src/components/CustomPages/SK/SK004CheckPost.js
+++ b/src/components/CustomPages/SK/SK004CheckPost.js
@@ -29,6 +29,7 @@ class SK004CheckPost extends React.Component {
           phone:'',
           post: {},
           cards: {},
+          selectedRowKeys:[],
             dataList: [],
             MineType:0,
             CHECK_CYCLE:0,
@@ -102,14 +103,14 @@ class SK004CheckPost extends React.Component {
                     return <label>{this.props.app.enums.SKEvaluateLevelEnum.enums[record.EVALUATE_LEVEL]}</label>
                   }
               },
-              {
-                title: '操作',
-                dataIndex: '',
-                key: '',
-                render: (text, record, index) => {
-                  return <Button type='defualt' size='small' onClick={(e) => { this.showModalCard(record) }} icon='eye' />
-                }
-              }
+              // {
+              //   title: '操作',
+              //   dataIndex: '',
+              //   key: '',
+              //   render: (text, record, index) => {
+              //     return <Button type='defualt' size='small' onClick={(e) => { this.showModalCard(record) }} icon='eye' />
+              //   }
+              // }
             ],
             columndatas : [
               {   
@@ -203,7 +204,11 @@ class SK004CheckPost extends React.Component {
         XLSX.writeFile(wb, "岗位风险清单.xlsx")
     }
 
-    
+    onSelectChange = (selectedRowKeys,selectedRows) => {  // 选择菜单行
+      this.setState({selectedRowKeys:selectedRowKeys,
+        taskSelects:selectedRows
+      });
+    };
     showModal = (item) => {
         this.setState({
             showDetail: true,
@@ -231,10 +236,55 @@ class SK004CheckPost extends React.Component {
       handleCancelCard = () => {
         this.setState({
           showCard: false,
-          cards:{}
+          cards:{},
+          taskSelects:[],
+          selectedRowKeys:[],
         });
       };
-      showModalCard = (record) => {
+      showModalCard = () => {
+        
+          let meas=[];let riskNames = [];let levels = [];
+          let descriptions=[];let riskTypes=[];let emergencys=[];let photos=[];
+          if (this.state.taskSelects && this.state.taskSelects.length > 0) 
+          {
+            for(var i = 0; i <this.state.taskSelects.length ; i++)
+            {
+              let tmpData = [];
+              let level=this.props.app.enums.SKEvaluateLevelEnum.enums[this.state.taskSelects[i].EVALUATE_LEVEL]
+              riskNames.push(this.state.taskSelects[i].RISK_NAME+'；')
+              levels.push(level+'；');
+              descriptions.push(this.state.taskSelects[i].RISK_NAME+"："+this.state.taskSelects[i].RISK_DESCRIPTION+'\n')
+              riskTypes.push(this.state.taskSelects[i].RISK_NAME+"："+this.state.taskSelects[i].Nav_Type?.NAME+'\n');
+              emergencys.push(this.state.taskSelects[i].RISK_NAME+"："+this.state.taskSelects[i].EMERGENCY+'\n');
+              photos.push(this.state.taskSelects[i].Nav_Photo[0]+'\n');
+              for(var j = 0; j <this.state.taskSelects[i].Nav_Details.length ; j++)
+              {
+                tmpData = tmpData+ '\n'+ (j+1)+"、" +this.state.taskSelects[i].Nav_Details[j].MEASURES_NAME
+              }
+              meas.push(this.state.taskSelects[i].RISK_NAME +"："+tmpData+'\n');
+            }
+            let temps={
+              RISK_NAME:riskNames,
+              RISK_CODE:this.state.postName,
+              EVALUATE_LEVEL:levels,
+              RISK_DESCRIPTION:descriptions,
+              MEASURES_NAME:meas,
+              RISK_TYPE:riskTypes,
+              EMERGENCY:emergencys,
+              photo:photos
+            }
+            this.setState({
+              cards:temps,
+              showCard: true,
+          });
+          }
+          else
+          {
+            message.error('请先选择风险！');
+            return;
+          }
+      };
+      showModalCardOld = (record) => {
         this.setState({
             showCard: true,
         },()=>{
@@ -264,7 +314,9 @@ class SK004CheckPost extends React.Component {
       closeModalCard = () => {
         this.setState({
           showCard: false,
-          cards:{}
+          cards:{},
+          taskSelects:[],
+          selectedRowKeys:[],
         });
       };
       handleSearch = ({data, record}) => {
@@ -300,6 +352,14 @@ class SK004CheckPost extends React.Component {
         labelCol: { span: 8 },
         wrapperCol: { span: 16 },
       }
+      const {selectedRowKeys} =this.state;
+      const rowSelection = {
+        selectedRowKeys:selectedRowKeys,
+        fixed: false,
+        columnWidth: 20,
+        hideDefaultSelections:false,
+        onChange: this.onSelectChange
+      };
         const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ;
         // let aaa = Math.random();
         return <div>
@@ -316,24 +376,27 @@ class SK004CheckPost extends React.Component {
             <br></br>
              <h2 style={{textAlign:'center',fontWeight:'bold',margin:"auto",color:"red"}}> {this.state.postName}岗位风险点告知卡</h2>
              <br></br>
-            <table style={{margin:"auto",alignContent:"center",width:"1000px"}} className={stylesStep.PrintForm} > 
+             <div style={{margin:"auto",alignContent:"center",width:"1200px"}} className={stylesStep.PrintForm}><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} /></div>
+             <br></br>
+             <div ref={el => (this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.id}>
+            <table style={{margin:"auto",alignContent:"center"}} className={stylesStep.PrintForm} > 
               <tr>
-               <td style={{backgroundColor:"yellow",width:"120px",textAlign:'center'}}>
-                风险点名称
+                <td style={{backgroundColor:"yellow",width:"120px",textAlign:'center'}}>岗位名称</td>
+                <td>  {this.state.cards?.RISK_CODE}</td>
+                <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}} rowSpan={3}>
+                风险描述
+               </td>
+               <td rowSpan={3}>
+               <div style={{whiteSpace:'pre-line'}}>{this.state.cards?.RISK_DESCRIPTION}</div>
+               </td>
+              </tr>
+              <tr>
+              <td style={{backgroundColor:"yellow",width:"120px",textAlign:'center'}}>
+                风险名称
                </td>
                <td>
                 {this.state.cards?.RISK_NAME}
                </td>
-               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}} rowSpan={3}>
-                主要危险因素描述
-               </td>
-               <td rowSpan={3}>
-               {this.state.cards?.RISK_DESCRIPTION}
-               </td>
-              </tr>
-              <tr>
-               <td style={{backgroundColor:"yellow",width:"120px",textAlign:'center'}}>风险点编号</td>
-               <td>  {this.state.cards?.RISK_CODE}</td>
               </tr>
               <tr>
                <td style={{backgroundColor:"yellow",width:"120px",textAlign:'center'}}>风险等级</td>
@@ -341,28 +404,32 @@ class SK004CheckPost extends React.Component {
               </tr>
               <tr>
                <td style={{backgroundColor:"yellow",width:"120px",textAlign:'center'}}>安全标志</td>
-               <td> {this.state.cards?.photo?showFiles(this.state.cards?.photo, config.picServerHost, this)
+               <td> <img  title={"安全标志"} src={require("../../../../src/assets/aqbz.png")} /> 
+               
+               </td>
+               {/* <td> {this.state.cards?.photo?showFiles(this.state.cards?.photo, config.picServerHost, this)
                  :<img  title={"安全标志"} src={require("../../../../src/assets/aqbz.png")} /> 
                }
-               </td>
-               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}}>主要风险控制措施</td>
-               <td> {this.state.cards?.MEASURES_NAME}</td>
+               </td> */}
+               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}}>管控措施</td>
+               <td><div style={{whiteSpace:'pre-line'}}>{this.state.cards?.MEASURES_NAME}</div> </td>
               </tr>
               <tr>
                <td style={{backgroundColor:"rgba(1,203,253)",color:"white",width:"120px",textAlign:'center'}}>责任单位</td>
                <td> {this.state?.departName}</td>
-               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}}>主要事故类型</td>
-               <td> {this.state.cards?.RISK_TYPE}</td>
+               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}}>风险类别</td>
+               <td> <div style={{whiteSpace:'pre-line'}}>{this.state.cards?.RISK_TYPE}</div></td>
               </tr>
               <tr>
                 <td style={{backgroundColor:"rgba(1,203,253)",color:"white",width:"120px",textAlign:'center'}}>责任人联系电话</td>
                <td> {this.state?.phone}</td>
-               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}}>应急处置措施</td>
-               <td> {this.state.cards?.EMERGENCY}</td>
+               <td style={{backgroundColor:"red",color:"white",width:"150px",textAlign:'center'}}>应急处置</td>
+               <td> <div style={{whiteSpace:'pre-line'}}>{this.state.cards?.EMERGENCY}</div></td>
               </tr>
             </table>
            
             <br></br>
+            </div>
           </Modal>
           <br></br>
             <Modal
@@ -374,10 +441,16 @@ class SK004CheckPost extends React.Component {
             className="antd-modal-fullscreen"
             closeModal={this.closeModal}
           >
+             <br></br>
+              <div className="antd-modal-fullscreen">
+                <Button type='primary' onClick={() => this.showModalCard()} icon="export">生成岗位告知卡</Button>
+            </div>
+            <br></br>
             <Table
               dataSource={this.state.Details}
               columns={this.state.columns}
-              pagination={true}
+              pagination={false}
+              rowSelection={rowSelection}
               bordered
               loading={false}
               size="small"
diff --git a/src/files/edit/SK004.js b/src/files/edit/SK004.js
index bafcc22..32f3ffe 100644
--- a/src/files/edit/SK004.js
+++ b/src/files/edit/SK004.js
@@ -196,7 +196,7 @@ export default {
       login.tempDatas.map(item=>{
         let tmpData = {
           ID:guid(),
-          NUM:item.ROW_NO,
+          NUM:item.NUM,
           MEASURES_NAME: item.MEASURES_NAME,
         }
         if(stateData && stateData.Nav_Details)
@@ -312,7 +312,7 @@ export default {
       stateData.EVALUATE_LEVEL=40;
       stateData.DEPARTMENT_TYPE="_2_";
       let temp={
-        DEPARTMENT_TYPE:2,
+        DEPARTMENT_TYPE:20,
       }
       departs.push(temp);
     }
@@ -324,16 +324,16 @@ export default {
         stateData.EVALUATE_LEVEL=10;
         stateData.DEPARTMENT_TYPE="_0_1_2_3_";
         let temp3={
-          DEPARTMENT_TYPE:3,
+          DEPARTMENT_TYPE:5,
         }
         let temp={
-          DEPARTMENT_TYPE:0,
+          DEPARTMENT_TYPE:10,
         }
         let temp1={
-          DEPARTMENT_TYPE:1,
+          DEPARTMENT_TYPE:15,
         }
         let temp2={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp3);
         departs.push(temp);
@@ -349,13 +349,13 @@ export default {
         // setFieldValue("EVALUATE_LEVEL", 20);
         // setFieldValue("DEPARTMENT_TYPE", "_0_1_2_");
         let temp={
-          DEPARTMENT_TYPE:0,
+          DEPARTMENT_TYPE:10,
         }
         let temp1={
-          DEPARTMENT_TYPE:1,
+          DEPARTMENT_TYPE:15,
         }
         let temp2={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp);
         departs.push(temp1);
@@ -368,10 +368,10 @@ export default {
         // setFieldValue("EVALUATE_LEVEL", 30);
         // setFieldValue("DEPARTMENT_TYPE", "_1_2_");
         let temp1={
-          DEPARTMENT_TYPE:1,
+          DEPARTMENT_TYPE:15,
         }
         let temp2={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp1);
         departs.push(temp2);
@@ -382,7 +382,7 @@ export default {
         // setFieldValue("EVALUATE_LEVEL", 40);
         // setFieldValue("DEPARTMENT_TYPE", "_2_");
         let temp={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp);
       }
@@ -536,19 +536,19 @@ export default {
         {
           let temp3={
             ID: guid(),
-            DEPARTMENT_TYPE:3,
+            DEPARTMENT_TYPE:5,
           }
           let temp={
             ID: guid(),
-            DEPARTMENT_TYPE:0,
+            DEPARTMENT_TYPE:10,
           }
           let temp1={
             ID: guid(),
-            DEPARTMENT_TYPE:1,
+            DEPARTMENT_TYPE:15,
           }
           let temp2={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp3);
           departs.push(temp);
@@ -559,15 +559,15 @@ export default {
         {
           let temp={
             ID: guid(),
-            DEPARTMENT_TYPE:0,
+            DEPARTMENT_TYPE:10,
           }
           let temp1={
             ID: guid(),
-            DEPARTMENT_TYPE:1,
+            DEPARTMENT_TYPE:15,
           }
           let temp2={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp);
           departs.push(temp1);
@@ -577,11 +577,11 @@ export default {
         {
           let temp1={
             ID: guid(),
-            DEPARTMENT_TYPE:1,
+            DEPARTMENT_TYPE:15,
           }
           let temp2={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp1);
           departs.push(temp2);
@@ -590,22 +590,23 @@ export default {
         {
           let temp={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp);
         }
       }
-      stateData.Nav_Departs = departs
+      // stateData.Nav_Departs = departs
       if(login.tempAddData.Nav_Details)
       {
         let details=[]
-        login.tempAddData.Nav_Details.map((item,k)=>{
+        login.tempAddData.Nav_Details.sort((x, y) => (x.NUM > y.NUM ? 1 : -1)).map((item,k)=>{
         let contents=[]
-        item.Nav_DetailContents && item.Nav_DetailContents.map((x,j)=>{
+        item.Nav_DetailContents && item.Nav_DetailContents.sort((x, y) => (x.NUM > y.NUM ? 1 : -1)).map((x,j)=>{
           let hiddens=[]
-          x.Nav_DetailHiddens && x.Nav_DetailHiddens.map((y,i)=>{
+          x.Nav_DetailHiddens && x.Nav_DetailHiddens.sort((x, y) => (x.NUM > y.NUM ? 1 : -1)).map((y,i)=>{
             let hidden={
               ID: guid(),
+              NUM:y.NUM,
               RECTIFICATION_MEASURES :y.RECTIFICATION_MEASURES,
               HIDDEN_LEVEL :y.HIDDEN_LEVEL,
               HIDDEN_DESCRIPTION :y.HIDDEN_DESCRIPTION,
@@ -625,6 +626,7 @@ export default {
           })
           let content={
             ID: guid(),
+            NUM:x.NUM,
             CHECK_STANDARD :x.CHECK_STANDARD,
             CHECK_CONTENTS_ID:x.CHECK_CONTENTS_ID,
             Nav_Contents:x.Nav_Contents,
@@ -635,6 +637,7 @@ export default {
         })
         let detail={
           ID: guid(),
+          NUM:item.NUM,
           MEASURES_NAME:item.MEASURES_NAME,
           Nav_DetailContents:contents
         }
@@ -648,6 +651,98 @@ export default {
      }
     }
   },
+  updateCheckLevel: ({ row, pageCode, record,dispatch, colInfo, stateData, login, saveRowRecord, setState, emptyEditSelectedKeys }) => {
+    if(stateData)
+    {
+      let temps=[]
+    if(!stateData.Nav_Departs)
+    {
+        message.error("请先填写管控层级！");
+        return;
+    }
+    else
+    {
+      let json = initFilter(login.OrgId);
+      extendRule(json, 'MineType', 1, stateData.MineType);
+      dispatch({
+        type: 'app/getDataByPost',
+        url: 'SK/CheckType/OrderEntities',
+        payload: json,
+        onlyData: false,
+        onComplete: (re) => {
+          if (re && re.IsSuccessful && re.Data) {
+            stateData.Nav_Departs.map(x=>{
+              let check=re.Data.filter(t=>t.NAME=="巡回检查")
+              let checkCycle=0;
+              if(x.DEPARTMENT_TYPE ===3)
+              {
+               //默认综合检查-每月
+                check=re.Data.filter(t=>t.NAME=="综合检查")
+                checkCycle=30
+              }
+              else if(x.DEPARTMENT_TYPE ===0)
+              {
+                //默认例行检查-每月
+                 check=re.Data.filter(t=>t.NAME=="例行检查")
+                 checkCycle=30
+              }
+              else if(x.DEPARTMENT_TYPE ===1)
+              {
+                //默认例行检查-每周
+                  check=re.Data.filter(t=>t.NAME=="例行检查")
+                  checkCycle=20
+              }
+              else
+              {
+                //默认巡回检查-每天
+                 check=re.Data.filter(t=>t.NAME=="巡回检查")
+                 checkCycle = 0
+              }
+              let temp={
+                ID: guid(),
+                NUM:x.NUM,
+                CHECK_TYPE :x.DEPARTMENT_TYPE,
+                DEPARTMENT_ID:x.DEPARTMENT_ID,
+                Nav_Department:x.Nav_Department,
+                CHECK_TYPE_ID:check[0].ID,
+                Nav_CheckType:check[0],
+                CHECK_CYCLE:checkCycle
+              }
+              temps.push(temp)
+            })
+          }
+          else
+          {
+            message.error("请先填写辨识岗位");
+            return;
+          }
+        }
+      })
+    }
+    if (stateData.Nav_Details)
+    {
+      stateData.Nav_Details.map(item=>{
+        if(!item.Nav_DetailContents)
+        {
+          message.error("请先填写检查内容！");
+          return;
+        }
+        else
+        {
+          item.Nav_DetailContents.map(x=>{
+            x.Nav_DetailDeparts = temps
+          })
+        }
+      })
+    }
+    else
+    {
+      message.error("请先填写管控措施！");
+      return;
+    }
+    setState(stateData);
+    }
+  },
   // btnSubAddContent: ({params, record, parentRecord,pageCode,tableConfig, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
   //   let temps=[];
   //   if(login.tempDatas && login.tempDatas.length>0)
diff --git a/src/files/list/SK066.js b/src/files/list/SK066.js
index 02845c3..9797537 100644
--- a/src/files/list/SK066.js
+++ b/src/files/list/SK066.js
@@ -21,14 +21,15 @@ export default {
           RISK_NAME_ID: item.RISK_NAME_ID,
           RISK_NAME: item.RISK_NAME,
           RISK_DESCRIPTION: item.RISK_DESCRIPTION,
-          CHECKLEVEL: item.CHECKLEVEL,
-          CHECKDEPT: item.CHECKDEPT,
-          CHECKPOST: item.CHECKPOST,
-          MEASURE: item.MEASURE,
+          // CHECKLEVEL: item.CHECKLEVEL,
+          // 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,
-          Nav_RiskName: item.Nav_RiskName,
+          // Nav_RiskName: item.Nav_RiskName,
           EVALUATE_SCORE: item.EVALUATE_SCORE,
           SCOREE_ID: item.SCOREE_ID,
           SCOREL_ID: item.SCOREL_ID,
@@ -36,6 +37,9 @@ 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
         }
         temps.push(tmpData);
       });
diff --git a/src/utils/customConfig.js b/src/utils/customConfig.js
index eb04ead..a1c9d72 100644
--- a/src/utils/customConfig.js
+++ b/src/utils/customConfig.js
@@ -2064,6 +2064,10 @@ const SK004CheckList = Loadable({
   loader: () => import('../components/CustomPages/SK/SK004CheckList'),
   loading: () => <div />
 })
+const SK004CheckListNew = Loadable({
+  loader: () => import('../components/CustomPages/SK/SK004CheckListNew'),
+  loading: () => <div />
+})
 const SK004CheckPost = Loadable({
   loader: () => import('../components/CustomPages/SK/SK004CheckPost'),
   loading: () => <div />
@@ -2583,6 +2587,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
     SK002ShowSummary: <SK002ShowSummary formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004ShowPrint: <SK004ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004CheckList: <SK004CheckList formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    SK004CheckListNew: <SK004CheckListNew formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004CheckPost: <SK004CheckPost formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004ShowSummary: <SK004ShowSummary formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004Import: <SK004Import formId={formId} formParam={formParam} data={data} formCode={formCode} />,
diff --git a/src/utils/customConfig1.js b/src/utils/customConfig1.js
index c51dbfe..397f654 100644
--- a/src/utils/customConfig1.js
+++ b/src/utils/customConfig1.js
@@ -1283,6 +1283,10 @@ const SK004CheckList = Loadable({
   loader: () => import('../components/CustomPages/SK/SK004CheckList'),
   loading: () => <div />
 })
+const SK004CheckListNew = Loadable({
+  loader: () => import('../components/CustomPages/SK/SK004CheckListNew'),
+  loading: () => <div />
+})
 const SK004CheckPost = Loadable({
   loader: () => import('../components/CustomPages/SK/SK004CheckPost'),
   loading: () => <div />
@@ -1786,6 +1790,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
     SK002ShowSummary: <SK002ShowSummary formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004ShowPrint: <SK004ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004CheckList: <SK004CheckList formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    SK004CheckListNew: <SK004CheckListNew formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004CheckPost: <SK004CheckPost formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004ShowSummary: <SK004ShowSummary formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     SK004Import: <SK004Import formId={formId} formParam={formParam} data={data} formCode={formCode} />,