diff --git a/src/components/CustomPages/BI/BI001HomeDetail.js b/src/components/CustomPages/BI/BI001HomeDetail.js
index 02419f5..df56729 100644
--- a/src/components/CustomPages/BI/BI001HomeDetail.js
+++ b/src/components/CustomPages/BI/BI001HomeDetail.js
@@ -35,7 +35,7 @@ class BI001HomeDetail extends React.Component {
// render: (text, record, index) => `${index + 1}`
// },
{
- title: "车间",
+ title: "上级组织",
dataIndex: "shopName",
render: (value, record, index) => {
const obj = {
@@ -145,7 +145,7 @@ class BI001HomeDetail extends React.Component {
},
},
{
- title: "班组",
+ title: "发起组织",
dataIndex: "teamName",
onCell:()=>this.renderSpeedColumn()
},
@@ -249,7 +249,7 @@ class BI001HomeDetail extends React.Component {
}
},
title: {
- text: "班组活动任务完成走势图",
+ text: "班组建设任务完成走势图",
left: "center",
top: "5%",
},
diff --git a/src/components/CustomPages/BI/BI002HomeDetail.js b/src/components/CustomPages/BI/BI002HomeDetail.js
index 230e4df..5cf9f61 100644
--- a/src/components/CustomPages/BI/BI002HomeDetail.js
+++ b/src/components/CustomPages/BI/BI002HomeDetail.js
@@ -35,7 +35,7 @@ class BI002HomeDetail extends React.Component {
// render: (text, record, index) => `${index + 1}`
// },
{
- title: "车间",
+ title: "上级组织",
dataIndex: "shopName",
render: (value, record, index) => {
const obj = {
@@ -145,7 +145,7 @@ class BI002HomeDetail extends React.Component {
},
},
{
- title: "班组",
+ title: "发起组织",
dataIndex: "teamName",
onCell:()=>this.renderSpeedColumn()
},
diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js
index 9cc591c..d1592f6 100644
--- a/src/components/CustomPages/SK/SK010ShowPrint.js
+++ b/src/components/CustomPages/SK/SK010ShowPrint.js
@@ -148,6 +148,7 @@ class SK010ShowPrint extends React.Component {
检查人员 |
检查情况 |
隐患描述 |
+ 隐患具体描述 |
隐患等级 |
隐患地点 |
隐患原因 |
@@ -208,6 +209,11 @@ class SK010ShowPrint extends React.Component {
item.Nav_Question?.DESCREPTION
}
+
+ {
+ item.HIDDEN_DESCRIPTION
+ }
+ |
{
enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js
index 817d4b7..2d3ffe8 100644
--- a/src/components/CustomPages/SK/SK012ShowPrint.js
+++ b/src/components/CustomPages/SK/SK012ShowPrint.js
@@ -169,6 +169,7 @@ class SK012ShowPrint extends React.Component {
| 检查人员 |
检查情况 |
隐患描述 |
+ 隐患具体描述 |
隐患等级 |
隐患地点 |
隐患原因 |
@@ -229,6 +230,11 @@ class SK012ShowPrint extends React.Component {
item.Nav_Question?.DESCREPTION
}
+
+ {
+ item.HIDDEN_DESCRIPTION
+ }
+ |
{
enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js
index ffb0330..8b688e7 100644
--- a/src/components/CustomPages/SK/SK014ShowPrint.js
+++ b/src/components/CustomPages/SK/SK014ShowPrint.js
@@ -144,12 +144,14 @@ class SK014ShowPrint extends React.Component {
| 检查区域 |
检查内容 |
隐患描述 |
+ 隐患具体描述 |
隐患等级 |
隐患地点 |
隐患原因 |
整改责任人 |
整改期限 |
- 备注 |
+ 整改措施 |
+ 整改措施具体描述 |
隐患照片 |
{
@@ -174,6 +176,11 @@ class SK014ShowPrint extends React.Component {
item.Nav_Question?.DESCREPTION
}
+
+ {
+ item.HIDDEN_DESCRIPTION
+ }
+ |
{
enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
@@ -208,6 +215,11 @@ class SK014ShowPrint extends React.Component {
moment(item.RECITIFY_TIME).format('YYYY-MM-DD')
}
|
+
+ {
+ item.Nav_Question?.DEMAND
+ }
+ |
{
item.REMARK
diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js
index c6b15ea..a78ae63 100644
--- a/src/components/CustomPages/SK/SK018ShowPrint.js
+++ b/src/components/CustomPages/SK/SK018ShowPrint.js
@@ -156,8 +156,10 @@ class SK018ShowPrint extends React.Component {
} */}
{/* {data.CHECKSTANDARD} */}
{data.Nav_Question?.DESCREPTION}
+ {data.HIDDEN_DESCRIPTION_DETAIL}
{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}
- {data.RECTIFICATION_MEASURES}
+ {data.Nav_Question?.DEMAND}
+ {data.RECTIFICATION_MEASURES}
{
data?.Nav_Reasons && data?.Nav_Reasons.map((item2, i) => {
diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js
index 347007b..0e02321 100644
--- a/src/components/CustomPages/SK/SK020ShowPrint.js
+++ b/src/components/CustomPages/SK/SK020ShowPrint.js
@@ -144,15 +144,18 @@ class SK020ShowPrint extends React.Component {
| 检查区域 |
{/* 检查内容 | */}
隐患描述 |
+ 隐患具体描述 |
隐患等级 |
隐患地点 |
隐患原因 |
- 整改措施 |
+ 整改措施 |
+ 整改措施具体描述 |
整改期限 |
整改落实人 |
验收人 |
备注 |
隐患照片 |
+
{
data?.Nav_RectifyDetails && data.Nav_RectifyDetails?.map((item, i) => {
@@ -172,7 +175,12 @@ class SK020ShowPrint extends React.Component {
| */}
{
- item.Nav_Question?.DESCREPTION ? item.Nav_Question.DESCREPTION : item.HIDDEN_DESCRIPTION
+ item.Nav_Question?.DESCREPTION
+ }
+ |
+
+ {
+ item.HIDDEN_DESCRIPTION
}
|
@@ -195,6 +203,11 @@ class SK020ShowPrint extends React.Component {
})
}
|
+
+ {
+ item.Nav_Question?.DEMAND
+ }
+ |
{
item.RECTIFICATION_MEASURES
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index b36637c..65045f5 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -139,9 +139,11 @@ class SK022ShowPrint extends React.Component {
// return |
})
}
- {data.Nav_Question?.DESCREPTION ? data.Nav_Question.DESCREPTION : data.HIDDEN_DESCRIPTION}
+ {data.Nav_Question?.DESCREPTION}
+ {data.HIDDEN_DESCRIPTION}
{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}
- {data.RECTIFICATION_MEASURES}
+ {data.Nav_Question?.DEMAND}
+ {data.RECTIFICATION_MEASURES}
{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}
{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}
{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}
@@ -176,7 +178,7 @@ class SK022ShowPrint extends React.Component {
showUserSign(data.Nav_AcceptUser, config.picServerHost)
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
}
- {data.REMARK}
+ {/* {data.REMARK} */}
: null
}
diff --git a/src/components/MainPage/SafeCheck.js b/src/components/MainPage/SafeCheck.js
index 5ad0f11..15b9920 100644
--- a/src/components/MainPage/SafeCheck.js
+++ b/src/components/MainPage/SafeCheck.js
@@ -104,6 +104,7 @@ class SafeCheck extends Component {
},
},
legend: {
+ show: false,
data: seriesName,
left: "center",
align: "left",
diff --git a/src/routes/Home.js b/src/routes/Home.js
index 8229e1e..4d171c2 100644
--- a/src/routes/Home.js
+++ b/src/routes/Home.js
@@ -1348,7 +1348,7 @@ class Home extends React.Component {
} else if (formCode == 'BI055_HOMEDETAIL') {
titleTemp += '月度隐患整改情况(近12月)';
} else if (formCode == 'BI001_HOMEDETAIL') {
- titleTemp += '班组活动任务完成详情(近12月)';
+ titleTemp += '班组建设任务完成详情(近12月)';
} else if (formCode == 'BI002_HOMEDETAIL') {
titleTemp += '工作票完成详情(近12月)';
} else if (formCode == 'BI013_RISKANALYSISMODEL') {
@@ -2022,7 +2022,7 @@ class Home extends React.Component {
- 班组活动完成率
+ 班组建设完成率
{this.state.departmentCompletionData.length > 0 ? (