fix(): 测值查询bug修复
parent
442c60a204
commit
febcef901f
|
|
@ -34,8 +34,8 @@ function DrpSearch({record}) {
|
||||||
} else {
|
} else {
|
||||||
setParams({
|
setParams({
|
||||||
...params,
|
...params,
|
||||||
stm: e[0].format("YYYY-MM-DD HH:mm"),
|
startTime: e[0].format("YYYY-MM-DD HH:mm"),
|
||||||
etm: e[1].format("YYYY-MM-DD HH:mm"),
|
endTime: e[1].format("YYYY-MM-DD HH:mm"),
|
||||||
tm:e,
|
tm:e,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ export default function dtOption(doubleData) {
|
||||||
const maxRz = Math.ceil(Math.max(...doubleData?.detailVos?.map(o => o.rz)))
|
const maxRz = Math.ceil(Math.max(...doubleData?.detailVos?.map(o => o.rz)))
|
||||||
const minRz = Math.floor(Math.min(...doubleData?.detailVos?.map(o => o.rz)))
|
const minRz = Math.floor(Math.min(...doubleData?.detailVos?.map(o => o.rz)))
|
||||||
const maxcy = Math.ceil(Math.max(...doubleData?.detailVos?.map(o => o.value)))
|
const maxcy = Math.ceil(Math.max(...doubleData?.detailVos?.map(o => o.value)))
|
||||||
const mincy = Math.floor(Math.max(...doubleData?.detailVos?.map(o => o.value)))
|
const mincy = Math.floor(Math.min(...doubleData?.detailVos?.map(o => o.value)))
|
||||||
console.log(maxRz,minRz,maxcy,mincy);
|
console.log(maxRz,minRz,maxcy,mincy);
|
||||||
// 字体颜色
|
// 字体颜色
|
||||||
const textColor = '#666'
|
const textColor = '#666'
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,9 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
|
||||||
setSelectKeys(newData.map(item => item.id))
|
setSelectKeys(newData.map(item => item.id))
|
||||||
let total = newData.reduce((total,cur) => total + Number(cur.standardScore),0)
|
let total = newData.reduce((total,cur) => total + Number(cur.standardScore),0)
|
||||||
setStandardScore(total)
|
setStandardScore(total)
|
||||||
|
form.setFieldValue("excellentScore",(total * 0.92).toFixed(2))
|
||||||
|
form.setFieldValue("goodScore",(total * 0.85).toFixed(2))
|
||||||
|
form.setFieldValue("passScore",(total * 0.70).toFixed(2))
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,10 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
const currentYear = moment().format('YYYY');
|
||||||
let dateRangeSo = {
|
let dateRangeSo = {
|
||||||
start: moment().subtract(1,"years").format('YYYY-MM-DD'),
|
start: moment(currentYear+ '-01-01').format('YYYY-MM-DD'),
|
||||||
end: moment().format('YYYY-MM-DD')
|
end: moment(currentYear+ '-12-31').format('YYYY-MM-DD')
|
||||||
}
|
}
|
||||||
form.setFieldValue("tm", [moment(dateRangeSo.start), moment(dateRangeSo.end)])
|
form.setFieldValue("tm", [moment(dateRangeSo.start), moment(dateRangeSo.end)])
|
||||||
setSearchVal({ dateRangeSo })
|
setSearchVal({ dateRangeSo })
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue