ccy/mh-lcmk-sms-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-lcmk-sms-web

Browse Source
This commit is contained in:
wyw 2024-08-15 15:32:22 +08:00
commit 3bded7145f
2 changed files with 553 additions and 493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/components/CustomPages/BI/BI007FormRunAnalysisNew.js
View File

@ -159,6 +159,13 @@ class BI007FormRunAnalysisNew extends React.Component {
title: "未完成", title: "未完成",
dataIndex: "UNFINISH_QTY", dataIndex: "UNFINISH_QTY",
key: "UNFINISH_QTY", key: "UNFINISH_QTY",
render: (text, record) => (
<span>
<a onClick={() => this.showUnfinishModal(record)}>
{record.UNFINISH_QTY}
</a>
</span>
),
}, },
{ {
width: "100px", width: "100px",
@ -258,7 +265,7 @@ class BI007FormRunAnalysisNew extends React.Component {
extendRule(json, "CREATE_DATE", 6, startTime); extendRule(json, "CREATE_DATE", 6, startTime);
extendRule(json, "CREATE_DATE", 4, endTime); extendRule(json, "CREATE_DATE", 4, endTime);
extendRule(json, "NOTICE_STATUS", 1, 0); extendRule(json, "NOTICE_STATUS", 1, 0);
extendRule(json, "SHOP_DEPARTMENT_ID", 1, record.DEPARTMENT_ID); extendRule(json, "CLASS_DEPARTMENT_ID", 1, record.DEPARTMENT_ID);
this.props.dispatch({ this.props.dispatch({
type: "app/getDataByPost", type: "app/getDataByPost",
payload: json, payload: json,
@ -294,7 +301,7 @@ class BI007FormRunAnalysisNew extends React.Component {
{ {
id: departmentId, id: departmentId,
name: departmentName, name: departmentName,
noticeTitle: departmentName + "安全生产标准化运行情况", noticeTitle: "安全生产标准化运行情况",
tmpData: newtmpData, tmpData: newtmpData,
currActivatedMenu: "", currActivatedMenu: "",
}, },
@ -441,33 +448,31 @@ class BI007FormRunAnalysisNew extends React.Component {
getDepartId = () => {}; getDepartId = () => {};
//加载数据赋值 //加载数据赋值
loadData = () => { loadData = () => {
// this.ksRun(); this.getShopDepartment();
// this.xkRun(); // var orgId = this.props.login ? this.props.login.OrgId : "";
var orgId = this.props.login ? this.props.login.OrgId : ""; // const jsonTemp = initFilter(orgId);
const jsonTemp = initFilter(orgId); // extendRule(
extendRule( // jsonTemp,
jsonTemp, // "NAME",
"NAME", // 1,
1, // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS // );
); // this.props.dispatch({
this.props.dispatch({ // type: "app/getDataByPost",
type: "app/getDataByPost", // payload: jsonTemp,
payload: jsonTemp, // url: "FM/Department/OrderEntities",
url: "FM/Department/OrderEntities", // onComplete: (retDepart) => {
onComplete: (retDepart) => { // if (retDepart) {
if (retDepart) { // this.getShopDepartment(retDepart[0].ID);
// this.getClassDepartment(retDepart[0].ID); // } else {
this.getShopDepartment(retDepart[0].ID); // message.error(
} else { // "未找到部门" +
message.error( // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS +
"未找到部门" + // "，请先维护"
this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS + // );
"，请先维护" // }
); // },
} // });
},
});
}; };
// //
workTicket = () => { workTicket = () => {
@ -863,13 +868,14 @@ class BI007FormRunAnalysisNew extends React.Component {
var orgId = this.props.login ? this.props.login.OrgId : ""; var orgId = this.props.login ? this.props.login.OrgId : "";
const jsonTemp = initFilter(orgId); const jsonTemp = initFilter(orgId);
extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 2); extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 2);
extendRule(jsonTemp, "ENABLE_STATUS", 1, 0);
// extendRule(jsonTemp, 'Nav_Parent.PARENT_ID', 1, this.props.data.id); // extendRule(jsonTemp, 'Nav_Parent.PARENT_ID', 1, this.props.data.id);
extendRule( // extendRule(
jsonTemp, // jsonTemp,
"Nav_Parent.Nav_Parent.NAME", // "Nav_Parent.Nav_Parent.NAME",
1, // 1,
this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
); // );
extendOrder(jsonTemp, "PARENT_ID", 0); extendOrder(jsonTemp, "PARENT_ID", 0);
extendOrder(jsonTemp, "NAME", 0); extendOrder(jsonTemp, "NAME", 0);
this.props.dispatch({ this.props.dispatch({
@ -942,17 +948,18 @@ class BI007FormRunAnalysisNew extends React.Component {
}); });
}; };
getShopDepartment = (departId) => { getShopDepartment = () => {
var orgId = this.props.login ? this.props.login.OrgId : ""; var orgId = this.props.login ? this.props.login.OrgId : "";
const jsonTemp = initFilter(orgId); const jsonTemp = initFilter(orgId);
extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 1); extendRule(jsonTemp, "DEPARTMENT_TYPE", 1, 2);
extendRule(jsonTemp, "ENABLE_STATUS", 1, 0);
// extendRule(jsonTemp, 'PARENT_ID', 1, this.props.data.id); // extendRule(jsonTemp, 'PARENT_ID', 1, this.props.data.id);
extendRule( // extendRule(
jsonTemp, // jsonTemp,
"Nav_Parent.NAME", // "Nav_Parent.NAME",
1, // 1,
this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS // this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS
); // );
this.props.dispatch({ this.props.dispatch({
type: "app/getDataByPost", type: "app/getDataByPost",
payload: jsonTemp, payload: jsonTemp,
@ -977,7 +984,7 @@ class BI007FormRunAnalysisNew extends React.Component {
"YYYY-MM-DD 00:00:00" "YYYY-MM-DD 00:00:00"
); );
let endTime = this.state.selectEndTime.format("YYYY-MM-DD 23:59:59"); let endTime = this.state.selectEndTime.format("YYYY-MM-DD 23:59:59");
let json = initFilter(orgId, departId, "", 1, "", startTime, endTime); let json = initFilter(orgId, null, "", 1, "", startTime, endTime);
// extendRule(json, 'TYPE', 1, this.state.timeType); // extendRule(json, 'TYPE', 1, this.state.timeType);
// extendRule(json, 'DEPARTMENT_TYPE', 1, 1); // extendRule(json, 'DEPARTMENT_TYPE', 1, 1);
// extendRule(json, 'PARENT_DEPARTMENT_ID', 1, this.props.data.id); // extendRule(json, 'PARENT_DEPARTMENT_ID', 1, this.props.data.id);
@ -1160,7 +1167,6 @@ class BI007FormRunAnalysisNew extends React.Component {
fontWeight: "bold", fontWeight: "bold",
}} }}
> >
{this.props?.login?.currActivatedMenu?.MENU_FORM_PARAMS}{" "}
安全生产标准化运行情况 安全生产标准化运行情况
</h1> </h1>
<Row style={{ textAlign: "center", fontSize: "15px" }}> <Row style={{ textAlign: "center", fontSize: "15px" }}>
@ -1330,7 +1336,7 @@ class BI007FormRunAnalysisNew extends React.Component {
</Col> </Col>
</div> </div>
</Row> </Row>
<Row {/* <Row
style={{ style={{
marginTop: "20px", marginTop: "20px",
display: "flex", display: "flex",
@ -1368,11 +1374,6 @@ class BI007FormRunAnalysisNew extends React.Component {
/> />
</Col> </Col>
</div> </div>
{/* <Col span={7}>
<h3 style={{textAlign:'center',fontWeight:'bold'}}>{this.props.data.name}安全任务完成情况</h3>
<div id="workTicket" style={{ height: '350px',marginLeft:"40px" ,marginRight:"10px" ,backgroundColor:"white",borderStyle:'solid',borderColor:'#ccc',borderWidth:'1px'}}></div>
</Col> */}
</Row> </Row>
<hr <hr
style={{ style={{
@ -1380,7 +1381,7 @@ class BI007FormRunAnalysisNew extends React.Component {
marginBottom: "20px", marginBottom: "20px",
marginTop: "20px", marginTop: "20px",
}} }}
></hr> ></hr> */}
<Row <Row
style={{ style={{
marginTop: "20px", marginTop: "20px",

941
src/layout/FullScreen.js
View File

File diff suppressed because it is too large Load Diff