This commit is contained in:
何美荣 2026-07-27 14:48:29 +08:00
parent 77da115023
commit 095a8ee8f9
3 changed files with 67 additions and 31 deletions

View File

@ -356,11 +356,18 @@ class BI009FormRunAnalysis extends React.Component {
}; };
getCount = () => { getCount = () => {
var orgId = this.props.login ? this.props.login.OrgId : ""; var orgId = this.props.login ? this.props.login.OrgId : "";
const jsonTemp = initFilter(orgId);
let startTime = this.state.selectStartTime.format("YYYY-MM-DD 00:00:00"); let startTime = this.state.selectStartTime.format("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");
extendRule(jsonTemp, "CREATE_TIME", 6, startTime); const jsonTemp = initFilter(orgId ,"",
extendRule(jsonTemp, "CREATE_TIME", 4, endTime); "",
"",
"",
"",
startTime,
endTime);
// extendRule(jsonTemp, "CREATE_TIME", 6, startTime);
// extendRule(jsonTemp, "CREATE_TIME", 4, endTime);
this.props.dispatch({ this.props.dispatch({
type: "app/getDataByPost", type: "app/getDataByPost",
payload: jsonTemp, payload: jsonTemp,
@ -414,7 +421,7 @@ class BI009FormRunAnalysis extends React.Component {
data: [ data: [
{ {
//上层圆环,显示数据 //上层圆环,显示数据
value: 95, value: ret.shiftMeetingFinishRate,
itemStyle: { itemStyle: {
color: "#1598FF", color: "#1598FF",
}, },
@ -477,7 +484,7 @@ class BI009FormRunAnalysis extends React.Component {
}, },
detail: { detail: {
formatter: function (params) { formatter: function (params) {
return 95 + "%"; return ret.shiftMeetingFinishRate + "%";
}, },
color: "#1598FF", color: "#1598FF",
fontSize: 20, fontSize: 20,
@ -488,7 +495,7 @@ class BI009FormRunAnalysis extends React.Component {
}, },
data: [ data: [
{ {
value: 95, value: ret.shiftMeetingFinishRate,
}, },
], ],
}, },
@ -643,7 +650,7 @@ class BI009FormRunAnalysis extends React.Component {
data: [ data: [
{ {
//上层圆环,显示数据 //上层圆环,显示数据
value: 97, value: ret.postFinishRate,
itemStyle: { itemStyle: {
color: "#f8a035", color: "#f8a035",
}, },
@ -706,7 +713,7 @@ class BI009FormRunAnalysis extends React.Component {
}, },
detail: { detail: {
formatter: function (params) { formatter: function (params) {
return 97 + "%"; return ret.postFinishRate + "%";
}, },
color: "#f8a035", color: "#f8a035",
fontSize: 20, fontSize: 20,
@ -717,7 +724,7 @@ class BI009FormRunAnalysis extends React.Component {
}, },
data: [ data: [
{ {
value: 97, value: ret.postFinishRate,
}, },
], ],
}, },
@ -872,7 +879,7 @@ class BI009FormRunAnalysis extends React.Component {
data: [ data: [
{ {
//上层圆环,显示数据 //上层圆环,显示数据
value: 99, value: ret.postChangeFinishRate,
itemStyle: { itemStyle: {
color: "#f1516d", color: "#f1516d",
}, },
@ -935,7 +942,7 @@ class BI009FormRunAnalysis extends React.Component {
}, },
detail: { detail: {
formatter: function (params) { formatter: function (params) {
return 99 + "%"; return ret.postChangeFinishRate + "%";
}, },
color: "#f1516d", color: "#f1516d",
fontSize: 20, fontSize: 20,
@ -946,7 +953,7 @@ class BI009FormRunAnalysis extends React.Component {
}, },
data: [ data: [
{ {
value: 99, value: ret.postChangeFinishRate,
}, },
], ],
}, },
@ -1073,8 +1080,8 @@ class BI009FormRunAnalysis extends React.Component {
let json = initFilter( let json = initFilter(
this.props.login.OrgId, this.props.login.OrgId,
"10", "10",
"NUM", "",
"asc", "",
"", "",
8, 8,
startTime, startTime,
@ -1236,8 +1243,8 @@ class BI009FormRunAnalysis extends React.Component {
let json = initFilter( let json = initFilter(
this.props.login.OrgId, this.props.login.OrgId,
"30", "30",
"NUM", "",
"asc", "",
"", "",
8, 8,
startTime, startTime,
@ -1395,11 +1402,18 @@ class BI009FormRunAnalysis extends React.Component {
}; };
//关键许可工作票(饼图) //关键许可工作票(饼图)
mainJobPie2 = () => { mainJobPie2 = () => {
let json = initFilter(this.props.login.OrgId);
let startTime = this.state.selectStartTime.format("YYYY-MM-DD 00:00:00"); let startTime = this.state.selectStartTime.format("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");
extendRule(json, "CREATE_TIME", 6, startTime); // extendRule(json, "CREATE_TIME", 6, startTime);
extendRule(json, "CREATE_TIME", 4, endTime); // extendRule(json, "CREATE_TIME", 4, endTime);
let json = initFilter(this.props.login.OrgId, "",
"",
"",
"",
"",
startTime,
endTime);
this.props.dispatch({ this.props.dispatch({
type: "app/getDataByPost", type: "app/getDataByPost",
url: "BI/BIStatiscialAnalysisController/GetLicenseJob", url: "BI/BIStatiscialAnalysisController/GetLicenseJob",
@ -1409,7 +1423,7 @@ class BI009FormRunAnalysis extends React.Component {
if (data && data.IsSuccessful) { if (data && data.IsSuccessful) {
let riskLevel = []; let riskLevel = [];
let showData = []; let showData = [];
let color = ["#C00000", "#FFC000", "#006600", "#00B0F0", "#00B0C0"]; let color = ["#C00000", "#FFC000", "#006600", "#00B0F0", "#00B0C0", "#8FBC8F", "#778899"];
let numAll = 0; let numAll = 0;
data.Data.forEach((item) => { data.Data.forEach((item) => {
riskLevel.push(item.RISK_LEVEL); riskLevel.push(item.RISK_LEVEL);
@ -1499,9 +1513,9 @@ class BI009FormRunAnalysis extends React.Component {
//图形样式 //图形样式
normal: { normal: {
borderColor: "#ffffff", borderColor: "#ffffff",
borderWidth: 4, borderWidth: 0,//1
padding: "0 20px", padding: "0 20px",
borderRadius: 50, borderRadius: 0,//8
}, },
}, },
label: { label: {

View File

@ -54,6 +54,7 @@ class BI012FormRunAnalysis extends React.Component {
yearColor: "black", yearColor: "black",
retData: [], retData: [],
departData:[], departData:[],
selectDeptName: this.props.login.user?.Nav_Department?.NAME || '',
DEPARTMENT_ID:null, DEPARTMENT_ID:null,
displayHr: "none", displayHr: "none",
displaydetail: "none", displaydetail: "none",
@ -236,6 +237,7 @@ class BI012FormRunAnalysis extends React.Component {
Nav_Department: { NAME: departData.record.NAME } Nav_Department: { NAME: departData.record.NAME }
}, },
DEPARTMENT_ID: departData.data[0], DEPARTMENT_ID: departData.data[0],
selectDeptName: departData.record.NAME
}) })
if(!this.state.inputText) if(!this.state.inputText)
{ {
@ -250,6 +252,7 @@ class BI012FormRunAnalysis extends React.Component {
Nav_Department: { NAME: null }, Nav_Department: { NAME: null },
}, },
DEPARTMENT_ID: null, DEPARTMENT_ID: null,
selectDeptName: ""
}) })
}; };
} }
@ -573,7 +576,10 @@ class BI012FormRunAnalysis extends React.Component {
> >
<b>选择部门</b> <b>选择部门</b>
<DropDownPagination inputDataApi={'FM/Department/OrderPaged'} fieldName={'Nav_Department.NAME'} <DropDownPagination inputDataApi={'FM/Department/OrderPaged'} fieldName={'Nav_Department.NAME'}
data={this.state.departData} onSelect={this.onSelectDepartment} value = {this.props.login.user?.Nav_Department?.NAME} onFilter={({ params }) => { data={this.state.departData} onSelect={this.onSelectDepartment} value = {this.state.selectDeptName}
allowClear={true} // 【关键】开启清除按钮
showSearch={true} // 可选:支持输入框编辑搜索
onFilter={({ params }) => {
params.OrderType = 1 params.OrderType = 1
params.OrgId = this.state.departData ? this.state.departData.ORG_ID : this.props.login.OrgId params.OrgId = this.state.departData ? this.state.departData.ORG_ID : this.props.login.OrgId
// extendRule(params, 'DEPARTMENT_TYPE', 1, 0) // extendRule(params, 'DEPARTMENT_TYPE', 1, 0)

View File

@ -127,6 +127,8 @@ getEndDate=()=>{
this.getBaseData(); this.getBaseData();
}; };
handleSearch = ({ data, record }) => { handleSearch = ({ data, record }) => {
if(record)
{
this.setState({ this.setState({
depart: { depart: {
...this.state.depart, ...this.state.depart,
@ -135,6 +137,18 @@ getEndDate=()=>{
}, },
inputText: record ? record?.NAME : this.state.inputText, inputText: record ? record?.NAME : this.state.inputText,
}); });
}
else
{
this.setState({
depart: {
...this.state.depart,
ID: null,
NAME: "",
},
inputText:"",
});
}
}; };
handleSearch2 = (value) => { handleSearch2 = (value) => {
let temps = ['安全风险辨识与评估计划','安全风险辨识表', '安全风险辨识结果表', '安全风险辨识结果汇总表', '安全风险评估表', let temps = ['安全风险辨识与评估计划','安全风险辨识表', '安全风险辨识结果表', '安全风险辨识结果汇总表', '安全风险评估表',
@ -614,6 +628,8 @@ getEndDate=()=>{
data={this.state.depart} data={this.state.depart}
value = {this.state.inputText} value = {this.state.inputText}
onSelect={this.handleSearch} onSelect={this.handleSearch}
allowClear={true} // 【关键】开启清除按钮
showSearch={true} // 可选:支持输入框编辑搜索
onFilter={({ params }) => { onFilter={({ params }) => {
params.OrderType = 1; params.OrderType = 1;
params.OrgId = this.props.login.OrgId; params.OrgId = this.props.login.OrgId;