Merge branch 'lsf-dev'

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(()=>{
+  // useEffect(() => {
-    if(openKeys?.[0]==='undefined'){
+  //   if (openKeys?.[0] === 'undefined') {
-      setOpenKeys(menuIndexes[1])
+  //     setOpenKeys(menuIndexes[1])
-    }
+  //   }
-  },[menuIndexes[1]])
+  // },[menuIndexes[1]])
 
 
   const onOpenChange = (keys: any) => {

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}]}
               >

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])
 

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: {

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`;