feats

src/pages/home/components/AssignedCharts.jsx

@@ -70,7 +70,7 @@ export default React.forwardRef((props, ref) => {
             emphasis: {
               focus: 'series'
             },
-            data: res.map(x => x.name)
+            data: res.map(x => x.value)
           }
         ]
       })
@@ -82,26 +82,33 @@ export default React.forwardRef((props, ref) => {
       setCondition({
         num: 7,
         statType: 'issue_daily',
-        startDate: dt[0].format('YY-MM-DD'),
-        endDate: dt[1].format('YY-MM-DD'),
+        startDate: dt[0].format('YYYY-MM-DD'),
+        endDate: dt[1].format('YYYY-MM-DD'),
       })
     } else if (typ == 2) {
       setCondition({
         num: dt[0].daysInMonth(),
         statType: 'issue_daily',
-        startDate: dt[0].format('YY-MM-DD'),
-        endDate: dt[1].format('YY-MM-DD'),
+        startDate: dt[0].format('YYYY-MM-DD'),
+        endDate: dt[1].format('YYYY-MM-DD'),
       })
     } else if (typ == 3) {
       setCondition({
-        num: 365,
-        statType: 'issue_daily',
-        startDate: dt[0].format('YY-MM-DD'),
-        endDate: dt[1].format('YY-MM-DD'),
+        num: 12,
+        statType: 'issue_monthly',
+        startDate: dt[0].format('YYYY-MM'),
+        endDate: dt[1].format('YYYY-MM'),
       })
+    } else {
+      // setCondition({
+      //   num: dt[0].daysInMonth(),
+      //   statType: 'issue_daily',
+      //   startDate: dt[0].format('YYYY-MM-DD'),
+      //   endDate: dt[1].format('YYYY-MM-DD'),
+      // })
     }
 
-    console.log('dt天数', dt[0].format('MM-DD'));
+    // console.log('dt天数', dt[0].format('MM-DD'));
     // console.log('dt,typ', dt, typ);
   }
 

src/pages/home/components/EscalationCharts.jsx

@@ -10,7 +10,7 @@ export default (props) => {
   // const [id, setId] = useState({});
   const [orgList, setOrgList] = useState([]);
   const [orgId, setOrgId] = useState();
-  console.log('orgId', orgId);
+  console.log('orgList', orgList[0]);
 
   React.useEffect(() => {
     getSysOrg({ pageSize: 500 }).then((res) => {

src/pages/home/components/RangeDate.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Card, DatePicker, Button } from 'antd';
+import { Radio, DatePicker, Button } from 'antd';
 import * as dayjs from 'dayjs';
 // import * as isLeapYear from 'dayjs/plugin/isLeapYear' // 导入插件
 // import 'dayjs/locale/zh-cn' // 导入本地化语言
@@ -9,53 +9,60 @@ export default (props) => {
   const { onChange } = props;
 
   const { RangePicker } = DatePicker;
-  const [date, setDate] = useState([]);
+  const [pickerValue, setPickerValue] = useState([]);
+  const [dtType, setDtType] = useState('2');
+  const dtTypeRef = React.useRef(dtType);
 
-  const updateDate = (dt, typ) => {
-    if (onChange) {
-      onChange(dt, typ);
-    }
-
-    setDate(dt);
+  const onRadioChange = e => {
+    const value = e.target.value;
+    setDtType(value);
+    dtTypeRef.current = value;
+    console.log('dtTypeRef.current', dtTypeRef.current)
   }
 
-  const onWeek = () => {
-    updateDate(
-      [
-        dayjs().startOf('week').add(1, 'day'),
-        dayjs().endOf('week').add(1, 'day')
-      ],
-      1
-    );
-  }
 
-  const onMonth = () => {
-    updateDate([
-      dayjs().startOf('month'),
-      dayjs().endOf('month')
-    ], 2)
-    // console.log('fangfang', dayjs().endOf('month'));
+  const onPickerChange = e => {
+    setPickerValue(e);
   }
 
-  const onYear = () => {
-    updateDate([
-      dayjs().startOf('year'),
-      dayjs().endOf('year')
-    ], 3)
-    // console.log('fangfang', dayjs().endOf('year'));
-  }
+  React.useEffect(() => {
+    if (dtType == 1) {
+      setPickerValue(
+        [
+          dayjs().startOf('week').add(1, 'day'),
+          dayjs().endOf('week').add(1, 'day')
+        ]
+      );
+    } else if (dtType == 2) {
+      setPickerValue([
+        dayjs().startOf('month'),
+        dayjs().endOf('month')
+      ])
+    } else if (dtType == 3) {
+      setPickerValue([
+        dayjs().startOf('year'),
+        dayjs().endOf('year')
+      ])
+    }
+  }, [dtType]);
 
-  const onRange = (e) => {
-    updateDate(e, 0);
-  }
+  React.useEffect(() => {
+    if (pickerValue && pickerValue.length > 1 && onChange) {
+      onChange(pickerValue, dtTypeRef.current);
+    }
+  }, [pickerValue]);
 
-  // console.log('data', data)
   return (
     <div>
-      <Button onClick={onWeek} type="text">本周</Button>
-      <Button onClick={onMonth} type="text">本月</Button>
-      <Button onClick={onYear} type="text">本年</Button>
-      <RangePicker onChange={onRange} value={date} />
+      <Radio.Group value={dtType} onChange={onRadioChange} style={{ marginRight: '20px' }}>
+        <Radio.Button value="1" type="text">本周</Radio.Button>
+        <Radio.Button value="2" type="text">本月</Radio.Button>
+        <Radio.Button value="3" type="text">本年</Radio.Button>
+      </Radio.Group>
+      <RangePicker
+        value={pickerValue}
+        onChange={onPickerChange}
+      />
     </div>
   )
 }