Compare commits
No commits in common. "3492bcff3c50c136ded9ec7e62f613df5c75d4ab" and "a1143b92609043ebb925b8c7b3dc8cbe9e5bb610" have entirely different histories.
3492bcff3c
...
a1143b9260
|
|
@ -4,7 +4,6 @@ import { FolderOutlined, ProfileOutlined } from '@ant-design/icons';
|
||||||
import { useLocation, useNavigate } from 'react-router';
|
import { useLocation, useNavigate } from 'react-router';
|
||||||
import { MenuItem } from '../../models/_';
|
import { MenuItem } from '../../models/_';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
import { debug } from 'console';
|
|
||||||
|
|
||||||
const { SubMenu } = Menu;
|
const { SubMenu } = Menu;
|
||||||
|
|
||||||
|
|
@ -39,11 +38,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) => {
|
const onOpenChange = (keys: any) => {
|
||||||
|
|
|
||||||
|
|
@ -293,7 +293,7 @@ const AdcdTreeSelector: React.FC<IProps> = ({ onSelectFun, setAdcd, showCheckbox
|
||||||
<Row>
|
<Row>
|
||||||
<Col span={24}>
|
<Col span={24}>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label="管控区域"
|
label="视频区域"
|
||||||
name="name"
|
name="name"
|
||||||
rules={[{required: true}]}
|
rules={[{required: true}]}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -195,7 +195,7 @@ const getResultList = async() => {
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
setFileList(imgFile)
|
setFileList(imgFile)
|
||||||
form.setFieldValue("result",record?.result?.map(item => item.sysDictId))
|
form.setFieldValue("result",record.result.map(item => item.sysDictId))
|
||||||
}
|
}
|
||||||
}, [record, mode])
|
}, [record, mode])
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,6 @@ export default function jgOptions(personData) {
|
||||||
tooltip: {},
|
tooltip: {},
|
||||||
xAxis: {
|
xAxis: {
|
||||||
type: 'category',
|
type: 'category',
|
||||||
axisLabel: {
|
|
||||||
interval: Xdata.length > 5 ? 0 : 1, // 强制显示所有标签
|
|
||||||
rotate: Xdata.length > 5 ? 20 : 0 // 旋转角度
|
|
||||||
},
|
|
||||||
data: Xdata
|
data: Xdata
|
||||||
},
|
},
|
||||||
yAxis: {
|
yAxis: {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
|
|
||||||
export default function jgOption(data1) {
|
export default function jgOption(data1) {
|
||||||
|
console.log("123", data1);
|
||||||
const one = `${process.env.PUBLIC_URL}/assets/images/one.png`;
|
const one = `${process.env.PUBLIC_URL}/assets/images/one.png`;
|
||||||
const two = `${process.env.PUBLIC_URL}/assets/images/two.png`;
|
const two = `${process.env.PUBLIC_URL}/assets/images/two.png`;
|
||||||
const three = `${process.env.PUBLIC_URL}/assets/images/three.png`;
|
const three = `${process.env.PUBLIC_URL}/assets/images/three.png`;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue