-
+ {/* className='route-home' ,boxShadow:'inset 0 0 10px #ccc' */}
+
+
{/* {this.props.data.name} */}
-
- - - - - - - {/* */} - - -
-
-
+
+
+
+
+
+
行洛坑钨矿-作业现场管理统计分析
-- - - - - - - {/* */} - - -
-
+ 行洛坑钨矿-作业现场管理统计分析 +
++
+
+
+
+ 一般作业活动记录
+
+
+
+ 许可作业活动记录
+
+
+
+ 班组安全活动
+
+
+
+ 岗位当班记录
+
+
+
+ 岗位交接班记录
+
+
+
+ 作业任务库
+
+
+
+ +
+ {this.state.ordinaryCount}
+
+ +
+ {this.state.crucialCount}
+
+ +
+ {this.state.activityCount}
+
+ +
{this.state.postCount}
+ {/* */}
+ {/* */}
+ +
+ {this.state.postChangeCount}
+
+ {/* */}
+ {/* */}
+ +
{this.state.taskCount}
+ +
+
+ +
+
-
-
-
-
-
+ {/*
'; - - }) - return temp; - } + text: "任务及时完成率（近6个月）", + left: "center", + top: "2%", }, - legend: { - // data: ['部门'], - data: ['完成率', '及时完成率'], - bottom: '5px' + tooltip: { + trigger: "axis", + formatter: function (params) { + let temp = ""; + params.forEach((t) => { + temp = + temp + t.marker + t.seriesName + ":" + t.value + "%" + "
"; + }); + return temp; + }, }, grid: { - left: '3%', - right: '4%', - top: '12%', - containLabel: true + left: "10%", + right: "5%", }, - toolbox: { - feature: { - // saveAsImage: {} - } + legend: { + left: "center", + align: "left", + bottom: "2%", + textStyle: { + color: "#000", + }, + itemWidth: 10, + itemHeight: 10, }, xAxis: { - type: 'category', - boundaryGap: false, + type: "category", data: month, - axisLine: { - show: false, - // lineStyle: { - // color: 'rgba(192, 192, 102)' - // } - }, - axisTick: { - show: false - }, + boundaryGap: false, axisLabel: { - color: '#000', - rotate: 40, - formatter: function (value) { // 自定义文字超出部分 ... - if (value.length > 10) { - return `${value.slice(0, 10)}...`; - } - return value; - } - } + textStyle: { + color: "#333", + }, + }, + axisLine: { + lineStyle: { + color: "#D9D9D9", + }, + }, }, yAxis: { - axisLabel: { - formatter: function (val) { - return (val)+ '%'; - } + type: "value", + axisLabel: { + textStyle: { + color: "#666", + }, + }, + nameTextStyle: { + color: "#666", + fontSize: 12, + lineHeight: 40, + }, + splitLine: { + lineStyle: { + type: "dashed", + color: "#E9E9E9", + }, + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, }, }, series: [ { - name: '完成率', - type: 'line', - color: '#4b9bf3', + name: "完成率", + type: "line", data: company, - smooth: true + smooth: true, + symbolSize: 8, + zlevel: 3, + lineStyle: { + normal: { + color: color[0], + shadowBlur: 3, + shadowColor: hexToRgba(color[0], 0.5), + shadowOffsetY: 8, + }, + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: hexToRgba(color[0], 0.3), + }, + { + offset: 1, + color: hexToRgba(color[0], 0.1), + }, + ], + false + ), + shadowColor: hexToRgba(color[0], 0.1), + shadowBlur: 10, + }, + }, }, { - name: '及时完成率', - type: 'line', - color: '#FCD149', + name: "及时完成率", + type: "line", data: department, - smooth: true + smooth: true, + symbolSize: 8, + zlevel: 3, + lineStyle: { + normal: { + color: color[1], + shadowBlur: 3, + shadowColor: hexToRgba(color[1], 0.5), + shadowOffsetY: 8, + }, + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: hexToRgba(color[1], 0.3), + }, + { + offset: 1, + color: hexToRgba(color[1], 0.1), + }, + ], + false + ), + shadowColor: hexToRgba(color[1], 0.1), + shadowBlur: 10, + }, + }, }, - ] - }) + ], + }); } - } - getMould=(inputText)=>{ - this.setState({loading:true - }) - var orgId = this.props.login ? this.props.login.OrgId : ''; - let json = initFilter(orgId,inputText,"","","",this.state.startTime,this.state.endTime); - this.props.dispatch({ - type: 'app/getDataByPost', - payload: json, - url: 'BI/BIStatiscialAnalysisController/GetPersonAnalyze', - onComplete: (ret) => { - if (ret) { - this.setState({ - retData:ret.groupData, - totalCount:ret.TotalCount, - finishCount:ret.doneCount, - overtimeCount:ret.timeOverCount, - unfinishCount:ret.unfinishCount, - dovertimeCount:ret.timeOverWaitCount, - loading:false - }) - this.ksRun(ret.groupDataLine); - } - else - { - this.setState({ - retData:[], - totalCount:0, - finishCount:0, - overtimeCount:0, - unfinishCount:0, - dovertimeCount:0, - loading:false - }) - } - } - }) - } - - closeModal = () => { // 退出弹窗 + }; + getMould = (inputText) => { + this.setState({ loading: true }); + var orgId = this.props.login ? this.props.login.OrgId : ""; + let json = initFilter( + orgId, + inputText, + "", + "", + "", + this.state.startTime, + this.state.endTime + ); + this.props.dispatch({ + type: "app/getDataByPost", + payload: json, + url: "BI/BIStatiscialAnalysisController/GetPersonAnalyze", + onComplete: (ret) => { + if (ret) { + this.setState({ + retData: ret.groupData, + totalCount: ret.TotalCount, + finishCount: ret.doneCount, + overtimeCount: ret.timeOverCount, + unfinishCount: ret.unfinishCount, + dovertimeCount: ret.timeOverWaitCount, + loading: false, + }); + this.ksRun(ret.groupDataLine); + } else { + this.setState({ + retData: [], + totalCount: 0, + finishCount: 0, + overtimeCount: 0, + unfinishCount: 0, + dovertimeCount: 0, + loading: false, + }); + } + }, + }); + }; + + closeModal = () => { + // 退出弹窗 this.clearData(); - } + }; clearData = () => { - let newtmpData = { ...this.state.tmpData } - newtmpData["data"].id = ''; + let newtmpData = { ...this.state.tmpData }; + newtmpData["data"].id = ""; newtmpData["data"].homeReload = false; - newtmpData.formCode = ''; + newtmpData.formCode = ""; this.setState({ visible: false, tmpData: newtmpData, - }) - } - handleCancel = () => { // 退出弹窗 + }); + }; + handleCancel = () => { + // 退出弹窗 this.clearData(); - } + }; handleSearch = (evt) => { - const { value } = evt.target - this.setState({ inputText: value ? value : this.props.login.user.NAME }) - } + const { value } = evt.target; + this.setState({ inputText: value ? value : this.props.login.user.NAME }); + }; render() { - const { startTime, endTime,finishCount,overtimeCount,totalCount,unfinishCount,inputText, - weekColor,monthColor,threeMonthColor,sixMonthColor,yearColor,dovertimeCount - } = this.state; - let allFinishRate=(totalCount ===0||totalCount==undefined) ?0:((finishCount+overtimeCount)/totalCount * 100).toFixed(1); - let finishRate=(totalCount ===0||totalCount==undefined)?0:(finishCount/totalCount * 100).toFixed(1); - return
+ 矿山部-班组及时完成率排名(%) +
+ - --
关键作业/许可作业
- ++ 选矿部-班组及时完成率排名(%) +
+ -选矿部-班组及时完成率排名(%)
- - --
矿山部-班组及时完成率排名(%)
- - - - - +'; - - }) - return temp; - } + text: "任务及时完成率（近6个月）", + left: "center", + top: "2%", }, - legend: { - // data: ['部门'], - data: ['完成率', '及时完成率'], - bottom: '5px' + tooltip: { + trigger: "axis", + formatter: function (params) { + let temp = ""; + params.forEach((t) => { + temp = + temp + t.marker + t.seriesName + ":" + t.value + "%" + "
"; + }); + return temp; + }, }, grid: { - left: '3%', - right: '4%', - top: '12%', - containLabel: true + left: "10%", + right: "5%", }, - toolbox: { - feature: { - // saveAsImage: {} - } + legend: { + left: "center", + align: "left", + bottom: "2%", + textStyle: { + color: "#000", + }, + itemWidth: 10, + itemHeight: 10, }, xAxis: { - type: 'category', - boundaryGap: false, + type: "category", data: month, - axisLine: { - show: false, - // lineStyle: { - // color: 'rgba(192, 192, 102)' - // } - }, - axisTick: { - show: false - }, + boundaryGap: false, axisLabel: { - color: '#000', - rotate: 40, - formatter: function (value) { // 自定义文字超出部分 ... - if (value.length > 10) { - return `${value.slice(0, 10)}...`; - } - return value; - } - } + textStyle: { + color: "#333", + }, + }, + axisLine: { + lineStyle: { + color: "#D9D9D9", + }, + }, }, yAxis: { - axisLabel: { - formatter: function (val) { - return (val)+ '%'; - } + type: "value", + axisLabel: { + textStyle: { + color: "#666", + }, + }, + nameTextStyle: { + color: "#666", + fontSize: 12, + lineHeight: 40, + }, + splitLine: { + lineStyle: { + type: "dashed", + color: "#E9E9E9", + }, + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, }, }, series: [ { - name: '完成率', - type: 'line', - color: '#4b9bf3', + name: "完成率", + type: "line", data: company, - smooth: true + smooth: true, + symbolSize: 8, + zlevel: 3, + lineStyle: { + normal: { + color: color[0], + shadowBlur: 3, + shadowColor: hexToRgba(color[0], 0.5), + shadowOffsetY: 8, + }, + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: hexToRgba(color[0], 0.3), + }, + { + offset: 1, + color: hexToRgba(color[0], 0.1), + }, + ], + false + ), + shadowColor: hexToRgba(color[0], 0.1), + shadowBlur: 10, + }, + }, }, { - name: '及时完成率', - type: 'line', - color: '#FCD149', + name: "及时完成率", + type: "line", data: department, - smooth: true + smooth: true, + symbolSize: 8, + zlevel: 3, + lineStyle: { + normal: { + color: color[1], + shadowBlur: 3, + shadowColor: hexToRgba(color[1], 0.5), + shadowOffsetY: 8, + }, + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: hexToRgba(color[1], 0.3), + }, + { + offset: 1, + color: hexToRgba(color[1], 0.1), + }, + ], + false + ), + shadowColor: hexToRgba(color[1], 0.1), + shadowBlur: 10, + }, + }, }, - ] - }) + ], + }); } - } - getMould=(inputText)=>{ - this.setState({loading:true - }) - var orgId = this.props.login ? this.props.login.OrgId : ''; - let json = initFilter(orgId,inputText,"","","",this.state.startTime,this.state.endTime); - this.props.dispatch({ - type: 'app/getDataByPost', - payload: json, - url: 'BI/BIStatiscialAnalysisController/GetPersonAnalyze', - onComplete: (ret) => { - if (ret) { - this.setState({ - retData:ret.groupData, - totalCount:ret.TotalCount, - finishCount:ret.doneCount, - overtimeCount:ret.timeOverCount, - unfinishCount:ret.unfinishCount, - dovertimeCount:ret.timeOverWaitCount, - loading:false - }) - this.ksRun(ret.groupDataLine); - } - else - { - this.setState({ - retData:[], - totalCount:0, - finishCount:0, - overtimeCount:0, - unfinishCount:0, - dovertimeCount:0, - loading:false - }) - } - } - }) - } - - closeModal = () => { // 退出弹窗 + }; + getMould = (inputText) => { + this.setState({ loading: true }); + var orgId = this.props.login ? this.props.login.OrgId : ""; + let json = initFilter( + orgId, + inputText, + "", + "", + "", + this.state.startTime, + this.state.endTime + ); + this.props.dispatch({ + type: "app/getDataByPost", + payload: json, + url: "BI/BIStatiscialAnalysisController/GetPersonAnalyze", + onComplete: (ret) => { + if (ret) { + this.setState({ + retData: ret.groupData, + totalCount: ret.TotalCount, + finishCount: ret.doneCount, + overtimeCount: ret.timeOverCount, + unfinishCount: ret.unfinishCount, + dovertimeCount: ret.timeOverWaitCount, + loading: false, + }); + this.ksRun(ret.groupDataLine); + } else { + this.setState({ + retData: [], + totalCount: 0, + finishCount: 0, + overtimeCount: 0, + unfinishCount: 0, + dovertimeCount: 0, + loading: false, + }); + } + }, + }); + }; + + closeModal = () => { + // 退出弹窗 this.clearData(); - } + }; clearData = () => { - let newtmpData = { ...this.state.tmpData } - newtmpData["data"].id = ''; + let newtmpData = { ...this.state.tmpData }; + newtmpData["data"].id = ""; newtmpData["data"].homeReload = false; - newtmpData.formCode = ''; + newtmpData.formCode = ""; this.setState({ visible: false, tmpData: newtmpData, - }) - } - handleCancel = () => { // 退出弹窗 + }); + }; + handleCancel = () => { + // 退出弹窗 this.clearData(); - } + }; handleSearch = (evt) => { - const { value } = evt.target - this.setState({ inputText: value ? value : this.props.login.user.NAME }) - } + const { value } = evt.target; + this.setState({ inputText: value ? value : this.props.login.user.NAME }); + }; render() { - const { startTime, endTime,finishCount,overtimeCount,totalCount,unfinishCount,inputText, - weekColor,monthColor,threeMonthColor,sixMonthColor,yearColor,dovertimeCount - } = this.state; - let allFinishRate=(totalCount ===0||totalCount==undefined) ?0:((finishCount+overtimeCount)/totalCount * 100).toFixed(1); - let finishRate=(totalCount ===0||totalCount==undefined)?0:(finishCount/totalCount * 100).toFixed(1); - return
- {/* className='route-home' ,boxShadow:'inset 0 0 10px #ccc' */}
-
-
+ {/* className='route-home' ,boxShadow:'inset 0 0 10px #ccc' */}
+
+
-
- 姓名：{inputText}
- 统计区间：{startTime} - {endTime}
-
-
-
-
-
- +
+
+ 姓名：
+ {inputText}
+
+
+ 统计区间：
+ {startTime} - {endTime}
+
+
+
+
+
+
+
+ {/*
*/} +
+
*/} -
-
*/}
- */}
+ {/*
任务完成情况统计分析(个人)
--
- +
+ 任务完成情况统计分析(个人) +
+*/} +
+
+
+ {/*
-
- {/*
+
+ 总任务数
+
+
+
+ 待办数
+
+
+
+ 超时待办数
+
+
+
+ 已办事项
+
+
+
+ 完成率
+
+
+
+ 及时完成率
+
+
+
+ +
+ {totalCount ? totalCount : 0}
+
+ +
+ {unfinishCount ? unfinishCount : 0}
+
+ +
+ {dovertimeCount ? dovertimeCount : 0}
+
+ +
+ {finishCount + overtimeCount
+ ? finishCount + overtimeCount
+ : 0}
+
+ {/* */}
+ {/* */}
+ +
+ {allFinishRate ? allFinishRate : 0}%
+
+ {/* */}
+ {/* */}
+ +
+ {finishRate ? finishRate : 0}%
+
+ */} -
*/}
- 任务及时完成率（近12个月）
*/} - -- * 统计时间：{moment(new Date()).format("YYYY-MM-DD HH:mm:ss")}
- - -
diff --git a/src/components/CustomPages/BI/BI054HomeDetail.js b/src/components/CustomPages/BI/BI054HomeDetail.js
index 2b2d9a8..76f25ad 100644
--- a/src/components/CustomPages/BI/BI054HomeDetail.js
+++ b/src/components/CustomPages/BI/BI054HomeDetail.js
@@ -62,6 +62,9 @@ class BI054HomeDetail extends React.Component {
componentWillUnmount() {
// this.timerID && clearTimeout(this.timerID);
}
+ renderSpeedColumn = ()=>{
+ return { className: 'redTableCell'}
+ }
loadReal = () => {
let result = {
ListSafeCheckCountDepartment: [
@@ -334,6 +337,7 @@ class BI054HomeDetail extends React.Component {
title: typeName[i],
dataIndex: "NUM",
key: i * 10 + j,
+ onCell: () => this.renderSpeedColumn(),
render: (value, record, index) => {
RowCount = record.Parent.RowCount;
if (
@@ -383,6 +387,7 @@ class BI054HomeDetail extends React.Component {
if (j == 0) {
columnsTb.push({
title: typeName[i],
+ onCell: () => this.renderSpeedColumn(),
key: i * 10 + j,
render: (value, record, index) => {
const obj = {
@@ -473,6 +478,7 @@ class BI054HomeDetail extends React.Component {
columnsTb.push({
title: typeName[i],
dataIndex: "NUM",
+ onCell: () => this.renderSpeedColumn(),
key: i * 10 + j,
render: (value, record, index) => {
RowCount = record.Parent.RowCount;
@@ -523,6 +529,7 @@ class BI054HomeDetail extends React.Component {
if (j == 0) {
columnsTb.push({
title: typeName[i],
+ onCell: () => this.renderSpeedColumn(),
key: i * 10 + j,
render: (value, record, index) => {
const obj = {
diff --git a/src/components/CustomPages/BI/BI055HomeDetail.js b/src/components/CustomPages/BI/BI055HomeDetail.js
index b61b4d9..ef8b996 100644
--- a/src/components/CustomPages/BI/BI055HomeDetail.js
+++ b/src/components/CustomPages/BI/BI055HomeDetail.js
@@ -276,6 +276,7 @@ class BI055HomeDetail extends React.Component {
columnsTb.push({
title: typeName[i],
dataIndex: "NUM",
+ onCell: () => this.renderSpeedColumn(),
key: i * 10 + j,
render: (value, record, index) => {
RowCount = record.Parent.RowCount;
@@ -356,6 +357,7 @@ class BI055HomeDetail extends React.Component {
if (j == 0) {
columnsTb.push({
title: typeName[i],
+ onCell: () => this.renderSpeedColumn(),
key: i * 10 + j,
render: (value, record, index) => {
const obj = {
@@ -456,6 +458,7 @@ class BI055HomeDetail extends React.Component {
//头部
columnsTb.push({
title: typeName[i],
+ onCell: () => this.renderSpeedColumn(),
dataIndex: "NUM",
key: i * 10 + j,
render: (value, record, index) => {
@@ -537,6 +540,7 @@ class BI055HomeDetail extends React.Component {
if (j == 0) {
columnsTb.push({
title: typeName[i],
+ onCell: () => this.renderSpeedColumn(),
key: i * 10 + j,
render: (value, record, index) => {
const obj = {
diff --git a/src/components/CustomPages/HM/HM042ShowPrint.js b/src/components/CustomPages/HM/HM042ShowPrint.js
index 4b3c951..ec027b7 100644
--- a/src/components/CustomPages/HM/HM042ShowPrint.js
+++ b/src/components/CustomPages/HM/HM042ShowPrint.js
@@ -83,12 +83,15 @@ class HM042ShowPrint extends React.Component {
if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
this.props.data.onCancel();
}
+
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_InitiatingDepartment');
extendInclude(json, 'Nav_ReleaseUser');
extendInclude(json, 'Nav_Details.Nav_ChargeUser');
+ extendInclude(json, 'Nav_Details.Nav_Areas.Nav_Area');
+ extendInclude(json, 'Nav_Details.Nav_Identifyings.Nav_Identifying');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_GroupLeader.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_DeputyGroupLeader.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
@@ -159,6 +162,43 @@ class HM042ShowPrint extends React.Component {
tmpData: newtmpData,
});
}
+ joinArea(data) {
+ let ret = [];
+ for (let it of data) {
+ if (it.Nav_Area && it.Nav_Area.NAME) {
+ ret.push(it.Nav_Area.NAME);
+ }
+ }
+ return ret.join('、');
+ }
+ joinIdentifying(data) {
+ let ret = [];
+ for (let it of data) {
+ if (it.Nav_Identifying && it.Nav_Identifying.NAME) {
+ ret.push(it.Nav_Identifying.NAME);
+ }
+ }
+ return ret.join('、');
+ }
+ renderLevel(level) {
+ let str = '';
+ if (level == undefined) {
+ return str;
+ }
+ if (level.indexOf('0') >= 0) {
+ str += '部门 ';
+ }
+ if (level.indexOf('1') >= 0) {
+ str += '车间 ';
+ }
+ if (level.indexOf('2') >= 0) {
+ str += '班组 ';
+ }
+ if (level.indexOf('3') >= 0) {
+ str += '公司 ';
+ }
+ return str;
+ }
render() {
const { data } = this.state;
return
@@ -217,6 +257,32 @@ class HM042ShowPrint extends React.Component {
{data.GROUP_LEADER_OPINION == 1 ? 
0 ? config.picServerHost + data.Nav_GroupLeader.Nav_UserSignFiles[0].Nav_ImgFile?.Nav_File.FILE_PATH : ''} /> : ""}
+
+
diff --git a/src/components/CustomPages/PF/PFCommonApprove.js b/src/components/CustomPages/PF/PFCommonApprove.js
index 2f1e092..a54504e 100644
--- a/src/components/CustomPages/PF/PFCommonApprove.js
+++ b/src/components/CustomPages/PF/PFCommonApprove.js
@@ -107,6 +107,7 @@ class PFCommonApprove extends React.Component {
case 'BS/BSRiskSubmit/DealEnd':
case 'BS/BSRiskSubmitDelayApply/DealEnd':
case 'FO/FOCrucialLicenseJob/BackUpdate':
+ case 'FO/FOCrucialLicenseJobOutsource/BackUpdate':
case 'FO/FOJobEventRecord/BackUpdate':
newUrl = this.state.data.CALLBACK_INTERFACE + 'New'
break;
diff --git a/src/components/CustomPages/SE/SE007ShowPrint.js b/src/components/CustomPages/SE/SE007ShowPrint.js
index ea7db89..fa49497 100644
--- a/src/components/CustomPages/SE/SE007ShowPrint.js
+++ b/src/components/CustomPages/SE/SE007ShowPrint.js
@@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Popconfirm, Row, Col, Checkbox, Radio, Form, Input, Select, Table, Upload, Icon, PageHeader, Modal } from 'antd';
import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendSelectField, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../../CustomPages/HI/StepForm.css';
import SEstyles from './SE.css';
@@ -54,13 +54,19 @@ class SE007ShowPrint extends React.Component {
return;
let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, this.props.data.id);
- extendInclude(json, 'Nav_LaunchDepartment');
- extendInclude(json, 'Nav_LaunchUser');
- extendInclude(json, 'Nav_Points.Nav_Point');
- extendInclude(json, 'Nav_JoinDepartment.Nav_Department');
- extendInclude(json, 'Nav_Demands.Nav_User.Nav_Department');
- extendInclude(json, 'Nav_Demands.Nav_Department');
- extendInclude(json, 'Nav_Demands.Nav_Items.Nav_DEMAND');
+ extendSelectField(json, 'NAME');
+ extendSelectField(json, 'LAUNCH_TIME');
+ extendSelectField(json, 'END_TIME');
+ extendSelectField(json, 'Nav_LaunchDepartment.NAME');
+ extendSelectField(json, 'Nav_LaunchUser.NAME');
+ extendSelectField(json, 'Nav_Points.Nav_Point.NAME');
+ extendSelectField(json, 'Nav_Demands.Nav_User.Nav_Department.NAME');
+ extendSelectField(json, 'Nav_Demands.Nav_Department.NAME');
+ extendSelectField(json, 'Nav_Demands.Nav_Items.Nav_DEMAND.NAME');
+ extendSelectField(json, 'Nav_Demands.OK');
+ extendSelectField(json, 'Nav_Demands.OTHER');
+ extendSelectField(json, 'Nav_Demands.Nav_User.NAME');
+
this.props.dispatch({
type: 'app/getDataByPost',
payload: json,
@@ -85,14 +91,14 @@ class SE007ShowPrint extends React.Component {
r[d.DEMAND_ID] = idx;
ROWS.push({
ID: d.DEMAND_ID,
- NAME: d.Nav_DEMAND.NAME,
+ NAME: d.Nav_DEMAND?.NAME,
department: [],
total: 0,
report: 0,
})
}
- let name = it.Nav_User.Nav_Department.NAME;
+ let name = it.Nav_User?.Nav_Department.NAME;
if (name == '宁化行洛坑钨矿有限公司') {
name = '公司领导';
}
@@ -109,7 +115,7 @@ class SE007ShowPrint extends React.Component {
if (it.OTHER != undefined && it.OTHER != "") {
ROWS1.push({
NAME: it.OTHER,
- department: [it.Nav_User.NAME],
+ department: [it.Nav_User?.NAME],
total: 1,
report: 1,
})
@@ -204,9 +210,9 @@ class SE007ShowPrint extends React.Component {
| 开始时间 | +结束时间 | +层级 | +辨识区域 | +类别 | +辨识对象 | +负责人 | +备注 | +
| {moment(item.START_TIME).format('YYYY-MM-DD')} | +{moment(item.END_TIME).format('YYYY-MM-DD')} | +{this.renderLevel(item.LEVEL)} | +{this.joinArea(item.Nav_Areas)} | +{this.joinIdentifying(item.Nav_Identifyings)} | +{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]} | +{item.Nav_ChargeUser?.NAME} | +{item.REMARK} | +
| { data?.Nav_Points && data?.Nav_Points.map((item, i) => { if (i == (data?.Nav_Points.length - 1)) { - return item.Nav_Point.NAME + return item.Nav_Point?.NAME } else { - return item.Nav_Point.NAME + ' ' + return item.Nav_Point?.NAME + ' ' } }) } | diff --git a/src/utils/common.js b/src/utils/common.js index cae311f..c0fc4c2 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -232,6 +232,13 @@ export function extendInclude(obj, clude) { } obj.Include.push(clude); } +export function extendSelectField(obj, clude) { + + if (!obj.SelectField) { + obj.SelectField = []; + } + obj.SelectField.push(clude); +} export function extendOrder(obj, filed, order) { var data = {}; @@ -740,14 +747,14 @@ export function getParseValueByDate(date) { n1 > 0 ? moment().add(n1, bts[0]) : n1 < 0 - ? moment().subtract(Math.abs(n1), bts[0]) - : moment(); + ? moment().subtract(Math.abs(n1), bts[0]) + : moment(); const e = n2 > 0 ? moment().add(n2, ets[0]) : n2 < 0 - ? moment().subtract(Math.abs(n2), ets[0]) - : moment(); + ? moment().subtract(Math.abs(n2), ets[0]) + : moment(); if (b.isBefore(e)) { r = [b, e]; } @@ -773,14 +780,14 @@ export function getParseValueByDate(date) { n1 > 0 ? moment().add(n1, ts[0]) : n1 < 0 - ? moment().subtract(Math.abs(n1), ts[0]) - : moment(); + ? moment().subtract(Math.abs(n1), ts[0]) + : moment(); const e = n2 > 0 ? moment().add(n2, ts[0]) : n2 < 0 - ? moment().subtract(Math.abs(n2), ts[0]) - : moment(); + ? moment().subtract(Math.abs(n2), ts[0]) + : moment(); if (b.isBefore(e)) { r = [b, e]; } @@ -867,9 +874,9 @@ export function getRulesByQueryFields(queryFields, groupList) { return timeIndex === 0 ? moment(time).format("YYYY-MM-DD") : moment(moment(time).format("YYYY-MM-DD")) - .add(1, "d") - .subtract(1, "s") - .format("YYYY-MM-DD HH:mm:ss"); + .add(1, "d") + .subtract(1, "s") + .format("YYYY-MM-DD HH:mm:ss"); }); // 将 2020-07-18 格式化成 2020-07-01 月份开始的时间 const monthFormat = moment(moment(vas[0]).format("YYYY-MM")).format( @@ -942,9 +949,9 @@ export function getRulesByQueryFields(queryFields, groupList) { k === 0 ? moment(j).format("YYYY-MM-DD") : moment(moment(j).format("YYYY-MM-DD")) - .add(1, "d") - .subtract(1, "s") - .format("YYYY-MM-DD HH:mm:ss"); + .add(1, "d") + .subtract(1, "s") + .format("YYYY-MM-DD HH:mm:ss"); const monthVal = moment(moment(j).format("YYYY-MM")).format( "YYYY-MM-DD" ); @@ -961,11 +968,11 @@ export function getRulesByQueryFields(queryFields, groupList) { ? t.DATA_TYPE === 16 ? dateHM : t.DATA_TYPE === 15 - ? dateHMS - : tmpVal + ? dateHMS + : tmpVal : t.DATA_TYPE === 9 || t.DATA_TYPE === 10 - ? monthVal - : yearVal, + ? monthVal + : yearVal, isCustom: t.IS_CUSTOM, isSysParam: t.IS_SYS_PARAM, }); @@ -1066,9 +1073,9 @@ export function getRuleAndGroupByParseValue({ k === 0 ? moment(j).format("YYYY-MM-DD") : moment(moment(j).format("YYYY-MM-DD")) - .add(1, "d") - .subtract(1, "s") - .format("YYYY-MM-DD HH:mm:ss"); + .add(1, "d") + .subtract(1, "s") + .format("YYYY-MM-DD HH:mm:ss"); vas += v + ","; }); if (ruleJson && ruleJson.rules) { @@ -1113,9 +1120,9 @@ export function getRuleAndGroupByParseValue({ k === 0 ? moment(j).format("YYYY-MM-DD") : moment(moment(j).format("YYYY-MM-DD")) - .add(1, "d") - .subtract(1, "s") - .format("YYYY-MM-DD HH:mm:ss"), + .add(1, "d") + .subtract(1, "s") + .format("YYYY-MM-DD HH:mm:ss"), isCustom: isCustom, }); }); @@ -1481,9 +1488,9 @@ export function showApprove(listApproveDetail, enums, imgHost, width, height) { title={ item.Nav_ApproveUser != null ? item.Nav_ApproveUser.NAME : "" } - // onError={(e) => { - // e.target.src = require('../assets/home/backlog.png'); - // }} + // onError={(e) => { + // e.target.src = require('../assets/home/backlog.png'); + // }} /> @@ -1517,9 +1524,9 @@ export function showApprove(listApproveDetail, enums, imgHost, width, height) { alt={ item.Nav_ApproveUser != null ? item.Nav_ApproveUser.NAME : "" } - // onError={(e) => { - // e.target.src = require('../assets/home/backlog.png'); - // }} + // onError={(e) => { + // e.target.src = require('../assets/home/backlog.png'); + // }} /> @@ -1717,23 +1724,23 @@ export function onBeforeSaveHandleRecordLog(params, formCode, title) { title, params.data.TaskID, " params.pageCode:[" + - params.pageCode + - "] params.data.id:[" + - params.data.id + - "] UserId:[" + - params.login.loginInfo.User.ID + - "] params.data.taskCode: [" + - params.data.taskCode + - "] homeReload: [" + - params.data.homeReload + - "]" + params.pageCode + + "] params.data.id:[" + + params.data.id + + "] UserId:[" + + params.login.loginInfo.User.ID + + "] params.data.taskCode: [" + + params.data.taskCode + + "] homeReload: [" + + params.data.homeReload + + "]" ); params.dispatch({ type: "app/getDataByPost", url: "PF/PFSysLog/addLog", payload: json, onlyData: false, - onComplete: (ret) => {}, + onComplete: (ret) => { }, }); } }