From 79aceb1e013a78f8020ce5124db6e3721fefd2cb Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Mon, 30 Sep 2024 13:13:27 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E8=80=83=E6=A0=B8=E7=BB=9F=E8=AE=A1bu?=
 =?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/components/DashboardLayout/SiderMenu.tsx          | 11 ++++++-----
 src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx |  2 +-
 src/views/rcgl/aqgl/fxgkqd/form.js                    |  2 +-
 src/views/rcgl/jdkh/khtj/jgOptions.js                 |  4 ++++
 src/views/sz/zzjgck/jgoption.js                       |  1 -
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/DashboardLayout/SiderMenu.tsx b/src/components/DashboardLayout/SiderMenu.tsx
index 5ce8bae6c..f8ed96d01 100644
--- a/src/components/DashboardLayout/SiderMenu.tsx
+++ b/src/components/DashboardLayout/SiderMenu.tsx
@@ -4,6 +4,7 @@ import { FolderOutlined, ProfileOutlined } from '@ant-design/icons';
 import { useLocation, useNavigate } from 'react-router';
 import { MenuItem } from '../../models/_';
 import { useSelector } from 'react-redux';
+import { debug } from 'console';
 
 const { SubMenu } = Menu;
 
@@ -38,11 +39,11 @@ const SiderMenu: React.FC<{
   }
 
 
-  useEffect(()=>{
-    if(openKeys?.[0]==='undefined'){
-      setOpenKeys(menuIndexes[1])
-    }
-  },[menuIndexes[1]])
+  // useEffect(() => {
+  //   if (openKeys?.[0] === 'undefined') {
+  //     setOpenKeys(menuIndexes[1])
+  //   }
+  // },[menuIndexes[1]])
 
 
   const onOpenChange = (keys: any) => {
diff --git a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx b/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx
index 61ea8f068..1f14ce04a 100644
--- a/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx
+++ b/src/views/rcgl/aqgl/fxgkqd/AdcdTreeSelector/index.tsx
@@ -293,7 +293,7 @@ const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox
           <Row>
             <Col span={24}>
               <Form.Item
-                label="视频区域"
+                label="管控区域"
                 name="name"
                 rules={[{required: true}]}
               >
diff --git a/src/views/rcgl/aqgl/fxgkqd/form.js b/src/views/rcgl/aqgl/fxgkqd/form.js
index 3689537f8..83784df46 100644
--- a/src/views/rcgl/aqgl/fxgkqd/form.js
+++ b/src/views/rcgl/aqgl/fxgkqd/form.js
@@ -195,7 +195,7 @@ const getResultList = async() => {
               },
       }))
         setFileList(imgFile)
-        form.setFieldValue("result",record.result.map(item => item.sysDictId))
+        form.setFieldValue("result",record?.result?.map(item => item.sysDictId))
       }
     }, [record, mode])
 
diff --git a/src/views/rcgl/jdkh/khtj/jgOptions.js b/src/views/rcgl/jdkh/khtj/jgOptions.js
index 7f364dc5f..da724e820 100644
--- a/src/views/rcgl/jdkh/khtj/jgOptions.js
+++ b/src/views/rcgl/jdkh/khtj/jgOptions.js
@@ -26,6 +26,10 @@ export default function jgOptions(personData) {
           tooltip: {},
           xAxis: {
             type: 'category',
+            axisLabel: {
+              interval: Xdata.length > 5 ? 0 : 1, // 强制显示所有标签
+              rotate: Xdata.length > 5 ? 20 : 0 // 旋转角度
+          },
             data: Xdata
           },
           yAxis: {
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
index c1ed7bb51..7ef1d8e97 100644
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -1,6 +1,5 @@
 
 export default function jgOption(data1) {
-  console.log("123", data1);
   const one = `${process.env.PUBLIC_URL}/assets/images/one.png`;
   const two = `${process.env.PUBLIC_URL}/assets/images/two.png`;
   const three = `${process.env.PUBLIC_URL}/assets/images/three.png`;