From 095a8ee8f9a9d44a15cb3d3a841e6afb1853f83e 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: Mon, 27 Jul 2026 14:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/BI/BI009FormRunAnalysis.js | 58 ++++++++++++------- .../CustomPages/BI/BI012FormRunAnalysis.js | 8 ++- .../CustomPages/BI/BI064FormRunAnalysis.js | 32 +++++++--- 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/src/components/CustomPages/BI/BI009FormRunAnalysis.js b/src/components/CustomPages/BI/BI009FormRunAnalysis.js index 1ccc689..e833ad0 100644 --- a/src/components/CustomPages/BI/BI009FormRunAnalysis.js +++ b/src/components/CustomPages/BI/BI009FormRunAnalysis.js @@ -356,11 +356,18 @@ class BI009FormRunAnalysis extends React.Component { }; getCount = () => { 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 endTime = this.state.selectEndTime.format("YYYY-MM-DD 23:59:59"); - extendRule(jsonTemp, "CREATE_TIME", 6, startTime); - extendRule(jsonTemp, "CREATE_TIME", 4, endTime); + const jsonTemp = initFilter(orgId ,"", + "", + "", + "", + "", + startTime, + endTime); + // extendRule(jsonTemp, "CREATE_TIME", 6, startTime); + // extendRule(jsonTemp, "CREATE_TIME", 4, endTime); this.props.dispatch({ type: "app/getDataByPost", payload: jsonTemp, @@ -414,7 +421,7 @@ class BI009FormRunAnalysis extends React.Component { data: [ { //上层圆环，显示数据 - value: 95, + value: ret.shiftMeetingFinishRate, itemStyle: { color: "#1598FF", }, @@ -477,7 +484,7 @@ class BI009FormRunAnalysis extends React.Component { }, detail: { formatter: function (params) { - return 95 + "%"; + return ret.shiftMeetingFinishRate + "%"; }, color: "#1598FF", fontSize: 20, @@ -488,7 +495,7 @@ class BI009FormRunAnalysis extends React.Component { }, data: [ { - value: 95, + value: ret.shiftMeetingFinishRate, }, ], }, @@ -643,7 +650,7 @@ class BI009FormRunAnalysis extends React.Component { data: [ { //上层圆环，显示数据 - value: 97, + value: ret.postFinishRate, itemStyle: { color: "#f8a035", }, @@ -706,7 +713,7 @@ class BI009FormRunAnalysis extends React.Component { }, detail: { formatter: function (params) { - return 97 + "%"; + return ret.postFinishRate + "%"; }, color: "#f8a035", fontSize: 20, @@ -717,7 +724,7 @@ class BI009FormRunAnalysis extends React.Component { }, data: [ { - value: 97, + value: ret.postFinishRate, }, ], }, @@ -872,7 +879,7 @@ class BI009FormRunAnalysis extends React.Component { data: [ { //上层圆环，显示数据 - value: 99, + value: ret.postChangeFinishRate, itemStyle: { color: "#f1516d", }, @@ -935,7 +942,7 @@ class BI009FormRunAnalysis extends React.Component { }, detail: { formatter: function (params) { - return 99 + "%"; + return ret.postChangeFinishRate + "%"; }, color: "#f1516d", fontSize: 20, @@ -946,7 +953,7 @@ class BI009FormRunAnalysis extends React.Component { }, data: [ { - value: 99, + value: ret.postChangeFinishRate, }, ], }, @@ -1073,8 +1080,8 @@ class BI009FormRunAnalysis extends React.Component { let json = initFilter( this.props.login.OrgId, "10", - "NUM", - "asc", + "", + "", "", 8, startTime, @@ -1236,8 +1243,8 @@ class BI009FormRunAnalysis extends React.Component { let json = initFilter( this.props.login.OrgId, "30", - "NUM", - "asc", + "", + "", "", 8, startTime, @@ -1395,11 +1402,18 @@ class BI009FormRunAnalysis extends React.Component { }; //关键许可工作票（饼图） mainJobPie2 = () => { - let json = initFilter(this.props.login.OrgId); + let startTime = this.state.selectStartTime.format("YYYY-MM-DD 00:00:00"); let endTime = this.state.selectEndTime.format("YYYY-MM-DD 23:59:59"); - extendRule(json, "CREATE_TIME", 6, startTime); - extendRule(json, "CREATE_TIME", 4, endTime); + // extendRule(json, "CREATE_TIME", 6, startTime); + // extendRule(json, "CREATE_TIME", 4, endTime); + let json = initFilter(this.props.login.OrgId, "", + "", + "", + "", + "", + startTime, + endTime); this.props.dispatch({ type: "app/getDataByPost", url: "BI/BIStatiscialAnalysisController/GetLicenseJob", @@ -1409,7 +1423,7 @@ class BI009FormRunAnalysis extends React.Component { if (data && data.IsSuccessful) { let riskLevel = []; let showData = []; - let color = ["#C00000", "#FFC000", "#006600", "#00B0F0", "#00B0C0"]; + let color = ["#C00000", "#FFC000", "#006600", "#00B0F0", "#00B0C0", "#8FBC8F", "#778899"]; let numAll = 0; data.Data.forEach((item) => { riskLevel.push(item.RISK_LEVEL); @@ -1499,9 +1513,9 @@ class BI009FormRunAnalysis extends React.Component { //图形样式 normal: { borderColor: "#ffffff", - borderWidth: 4, + borderWidth: 0,//1 padding: "0 20px", - borderRadius: 50, + borderRadius: 0,//8 }, }, label: { diff --git a/src/components/CustomPages/BI/BI012FormRunAnalysis.js b/src/components/CustomPages/BI/BI012FormRunAnalysis.js index 805f369..197bb7e 100644 --- a/src/components/CustomPages/BI/BI012FormRunAnalysis.js +++ b/src/components/CustomPages/BI/BI012FormRunAnalysis.js @@ -54,6 +54,7 @@ class BI012FormRunAnalysis extends React.Component { yearColor: "black", retData: [], departData:[], + selectDeptName: this.props.login.user?.Nav_Department?.NAME || '', DEPARTMENT_ID:null, displayHr: "none", displaydetail: "none", @@ -236,6 +237,7 @@ class BI012FormRunAnalysis extends React.Component { Nav_Department: { NAME: departData.record.NAME } }, DEPARTMENT_ID: departData.data[0], + selectDeptName: departData.record.NAME }) if(!this.state.inputText) { @@ -250,6 +252,7 @@ class BI012FormRunAnalysis extends React.Component { Nav_Department: { NAME: null }, }, DEPARTMENT_ID: null, + selectDeptName: "" }) }; } @@ -573,7 +576,10 @@ class BI012FormRunAnalysis extends React.Component { > 选择部门： { + data={this.state.departData} onSelect={this.onSelectDepartment} value = {this.state.selectDeptName} + allowClear={true} // 【关键】开启清除按钮 + showSearch={true} // 可选：支持输入框编辑搜索 + onFilter={({ params }) => { params.OrderType = 1 params.OrgId = this.state.departData ? this.state.departData.ORG_ID : this.props.login.OrgId // extendRule(params, 'DEPARTMENT_TYPE', 1, 0) diff --git a/src/components/CustomPages/BI/BI064FormRunAnalysis.js b/src/components/CustomPages/BI/BI064FormRunAnalysis.js index edcef3d..423f26e 100644 --- a/src/components/CustomPages/BI/BI064FormRunAnalysis.js +++ b/src/components/CustomPages/BI/BI064FormRunAnalysis.js @@ -127,14 +127,28 @@ getEndDate=()=>{ this.getBaseData(); }; handleSearch = ({ data, record }) => { - this.setState({ - depart: { - ...this.state.depart, - ID: data[0], - NAME: record?.NAME, - }, - inputText: record ? record?.NAME : this.state.inputText, - }); + if(record) + { + this.setState({ + depart: { + ...this.state.depart, + ID: data[0], + NAME: record?.NAME, + }, + inputText: record ? record?.NAME : this.state.inputText, + }); + } + else + { + this.setState({ + depart: { + ...this.state.depart, + ID: null, + NAME: "", + }, + inputText:"", + }); + } }; handleSearch2 = (value) => { let temps = ['安全风险辨识与评估计划','安全风险辨识表', '安全风险辨识结果表', '安全风险辨识结果汇总表', '安全风险评估表', @@ -614,6 +628,8 @@ getEndDate=()=>{ data={this.state.depart} value = {this.state.inputText} onSelect={this.handleSearch} + allowClear={true} // 【关键】开启清除按钮 + showSearch={true} // 可选：支持输入框编辑搜索 onFilter={({ params }) => { params.OrderType = 1; params.OrgId = this.props.login.OrgId;