From 886e22feef7fc2a676d224c740821c219136d932 Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Sat, 12 Oct 2024 16:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/gxsl/gsnlfx/KrLine.js | 14 +++++++++++---
 src/views/sz/pxjlgl/options.js  | 24 +++++++++++++-----------
 src/views/sz/pxjlgl/toolbar.js  |  4 ++--
 src/views/zbgl/zbrz/toolbar.js  |  4 ++--
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/gxsl/gsnlfx/KrLine.js b/src/views/gxsl/gsnlfx/KrLine.js
index a08769f01..e5406ddf8 100644
--- a/src/views/gxsl/gsnlfx/KrLine.js
+++ b/src/views/gxsl/gsnlfx/KrLine.js
@@ -41,8 +41,15 @@ export default function KrLine({ record }) {
     };
     
     const doSearch = () => {
-        search({ search: params })
-        getData(params)
+      const exportParams={
+        ...params,
+        stm: params.tm[0].format("YYYY-MM-DD HH:mm:ss"),
+        etm: params.tm[1].format("YYYY-MM-DD HH:mm:ss"),
+        tm:params.tm,
+      }
+        search({ search: exportParams })
+        // debugger;
+        getData(exportParams)
       }
     
     
@@ -53,7 +60,8 @@ export default function KrLine({ record }) {
         const params = {
             search: {
                 stm,
-                etm
+                etm,
+                stcd:record.stcd
             }
         }
         if (record?.stcd) {
diff --git a/src/views/sz/pxjlgl/options.js b/src/views/sz/pxjlgl/options.js
index a87590454..d17c2932d 100644
--- a/src/views/sz/pxjlgl/options.js
+++ b/src/views/sz/pxjlgl/options.js
@@ -36,18 +36,18 @@ export default function options(data={}) {
         },
         xAxis: {
            data:xAxisData,
-           axisLine: {
-           show: true // 隐藏X轴轴线
-           },
-           axisTick: {
-           show: true // 隐藏X轴轴线
-           },
+         //   axisLine: {
+         //   show: false // 隐藏X轴轴线
+         //   },
+         //   axisTick: {
+         //   show: false // 隐藏X轴轴线
+         //   },
      
-           axisLabel: {
-           show: true,
-           margin: 14,
-            //  formatter: '{value}月'
-           }
+         //   axisLabel: {
+         //   show: true,
+         //   margin: 14,
+         //    //  formatter: '{value}月'
+         //   }
         },
         yAxis: [
            {
@@ -55,6 +55,7 @@ export default function options(data={}) {
            offset: 10,
            min: minCount,
            max: maxCount,
+         //   splitLine:false,
            axisTick: {
               show: false
            },
@@ -71,6 +72,7 @@ export default function options(data={}) {
            {
            type: 'value',
            name: '(%)',
+           splitLine:false,
          
               min: minRate,
             max: maxRate,
diff --git a/src/views/sz/pxjlgl/toolbar.js b/src/views/sz/pxjlgl/toolbar.js
index 9734131fb..5dd553ed8 100644
--- a/src/views/sz/pxjlgl/toolbar.js
+++ b/src/views/sz/pxjlgl/toolbar.js
@@ -36,8 +36,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role = [],callback,exportFil
     let dateSo;
     if (values.tm) {
       dateSo = {
-        stm: moment(values.tm[0]).format('YYYY'),
-        etm: moment(values.tm[1]).format('YYYY')
+        stm: moment(values.tm[0]),
+        etm: moment(values.tm[1])
       }
     }
     delete values.tm
diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js
index fdbd94c96..4b664bea7 100644
--- a/src/views/zbgl/zbrz/toolbar.js
+++ b/src/views/zbgl/zbrz/toolbar.js
@@ -20,7 +20,7 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => {
       }
     }
     delete values.tm
-    setSearchVal({...values, startTime:dateSo?.start,endTime:dateSo?.end});
+    setSearchVal({...values, dateSo});
   }
 
  
@@ -31,7 +31,7 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => {
        end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
     }
     form.setFieldValue("tm",time)
-    setSearchVal(dateSo)
+    setSearchVal({dateSo})
   }, [])
   return (
     <>