lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lsf-dev'

lsf-dev
李神峰 2024-10-24 15:17:10 +08:00
parent 51137cebf8 febcef901f
commit 54045586ce
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/Home/MapCtrl/components/Jcsj/index.js
View File

@ -34,8 +34,8 @@ function DrpSearch({record}) {
} else {
setParams({
...params,
stm: e[0].format("YYYY-MM-DD HH:mm"),
etm: e[1].format("YYYY-MM-DD HH:mm"),
startTime: e[0].format("YYYY-MM-DD HH:mm"),
endTime: e[1].format("YYYY-MM-DD HH:mm"),
tm:e,
})

2
src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
View File

@ -5,7 +5,7 @@ export default function dtOption(doubleData) {
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 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);
// 字体颜色
const textColor = '#666'

3
src/views/rcgl/jdkh/khmbgl/form.js
View File

@ -100,6 +100,9 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
setSelectKeys(newData.map(item => item.id))
let total = newData.reduce((total,cur) => total + Number(cur.standardScore),0)
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))
};

5
src/views/rcgl/jdkh/khwtzg/toolbar.js
View File

@ -19,9 +19,10 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
}
useEffect(() => {
const currentYear = moment().format('YYYY');
let dateRangeSo = {
start: moment().subtract(1,"years").format('YYYY-MM-DD'),
end: moment().format('YYYY-MM-DD')
start: moment(currentYear+ '-01-01').format('YYYY-MM-DD'),
end: moment(currentYear+ '-12-31').format('YYYY-MM-DD')
}
form.setFieldValue("tm", [moment(dateRangeSo.start), moment(dateRangeSo.end)])
setSearchVal({ dateRangeSo })