From febcef901fcacc438b069a233eafa0173b8aca2c Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Thu, 24 Oct 2024 15:16:40 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E6=B5=8B=E5=80=BC=E6=9F=A5=E8=AF=A2bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/MapCtrl/components/Jcsj/index.js | 4 ++--
 src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js      | 2 +-
 src/views/rcgl/jdkh/khmbgl/form.js              | 3 +++
 src/views/rcgl/jdkh/khwtzg/toolbar.js           | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/Home/MapCtrl/components/Jcsj/index.js b/src/views/Home/MapCtrl/components/Jcsj/index.js
index e8fbf8057..c458e3294 100644
--- a/src/views/Home/MapCtrl/components/Jcsj/index.js
+++ b/src/views/Home/MapCtrl/components/Jcsj/index.js
@@ -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,
       })
       
diff --git a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
index 381ddee9e..434c92f0a 100644
--- a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
+++ b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js
@@ -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'
diff --git a/src/views/rcgl/jdkh/khmbgl/form.js b/src/views/rcgl/jdkh/khmbgl/form.js
index b31289431..aeffcb967 100644
--- a/src/views/rcgl/jdkh/khmbgl/form.js
+++ b/src/views/rcgl/jdkh/khmbgl/form.js
@@ -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))
   }; 
 
 
diff --git a/src/views/rcgl/jdkh/khwtzg/toolbar.js b/src/views/rcgl/jdkh/khwtzg/toolbar.js
index 7788a65b0..a1a4bcf20 100644
--- a/src/views/rcgl/jdkh/khwtzg/toolbar.js
+++ b/src/views/rcgl/jdkh/khwtzg/toolbar.js
@@ -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 })