Merge branch 'master' into dev1.0

src/pages/answerRecord/fieldEvaluation/index.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+import Page from '@/components/Page';
+import { useNavigate } from 'react-router-dom';
+import { queryTable } from "@/utils/request";
+import { ProTable } from "@ant-design/pro-components";
+import { Button } from "antd";
+
+export default (props) => {
+
+  const columns = [
+    {
+      title: "模拟测评名称",
+      dataIndex: "title",
+    },
+    {
+      title: "小区",
+    },
+    {
+      title: "点位名称",
+      dataIndex: "startDate",
+    },
+    {
+      title: "题干",
+      dataIndex: "endDate",
+    },
+    {
+      title: "答案",
+      dataIndex: "status",
+    },
+    {
+      title: "答题时间",
+      dataIndex: "status",
+    },
+    {
+      title: "答题人",
+      dataIndex: "status",
+    },
+    {
+      title: "详情",
+      dataIndex: "status",
+    }
+  ]
+
+  return (
+    <Page>
+      <ProTable
+        search={false}
+        columns={columns}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+          >
+            导出
+          </Button>,
+        ]}
+      />
+    </Page>
+  )
+}

src/pages/answerRecord/quesInvestigation/index.jsx

@@ -0,0 +1,61 @@
+import React from 'react';
+import Page from '@/components/Page';
+import { useNavigate } from 'react-router-dom';
+import { queryTable } from "@/utils/request";
+import { ProTable } from "@ant-design/pro-components";
+import { Button } from "antd";
+
+export default (props) => {
+
+  const columns = [
+    {
+      title: "模拟测评名称",
+      dataIndex: "title",
+    },
+    {
+      title: "小区",
+    },
+    {
+      title: "题干",
+      dataIndex: "startDate",
+    },
+    {
+      title: "答案",
+      dataIndex: "status",
+    },
+
+    {
+      title: "答题人",
+      dataIndex: "status",
+    },
+    {
+      title: "答题时间",
+      dataIndex: "status",
+    },
+    {
+      title: "受访者性别",
+      dataIndex: "status",
+    },
+    {
+      title: "年龄段",
+      dataIndex: "status",
+    }
+  ]
+
+  return (
+    <Page>
+      <ProTable
+        search={false}
+        columns={columns}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+          >
+            导出
+          </Button>,
+        ]}
+      />
+    </Page>
+  )
+}

src/pages/home/components/AssignedCharts.jsx

@@ -13,7 +13,6 @@ export default React.forwardRef((props, ref) => {
 
   React.useEffect(() => {
     if (!condition) return;
-
     getStatIssue(condition).then((res) => {
       setOption({
         tooltip: {
@@ -77,6 +76,7 @@ export default React.forwardRef((props, ref) => {
     })
   }, [condition]);
 
+  //子组件通过点击或自定义传过来的值变成参数条件set给condition
   const onChange = (dt, typ) => {
     if (typ == 1) {
       setCondition({
@@ -100,16 +100,15 @@ export default React.forwardRef((props, ref) => {
         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'),
-      // })
+      setCondition({
+        num: dayjs(dt[1]).diff(dt[0], 'day'),
+        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,typ', dt, typ);
+    // console.log('dt天数', dayjs(dt[1]).diff(dt[0], 'day'));
   }
 
   return (

src/pages/home/components/EscalationCharts.jsx

@@ -7,10 +7,15 @@ import { getSysOrg } from "@/service/sysorg";
 
 export default (props) => {
   const [option, setOption] = useState({});
-  // const [id, setId] = useState({});
   const [orgList, setOrgList] = useState([]);
   const [orgId, setOrgId] = useState();
-  console.log('orgList', orgList[0]);
+  const [condition, setCondition] = useState();
+
+  const onChange = e => {
+    setCondition({ orgId: e })
+    setOrgId(e)
+  }
+  console.log('orgId', orgId);
 
   React.useEffect(() => {
     getSysOrg({ pageSize: 500 }).then((res) => {
@@ -19,7 +24,7 @@ export default (props) => {
   }, []);
 
   React.useEffect(() => {
-    getStatEscalation({ orgId: orgId }).then((res) => {
+    getStatEscalation(condition).then((res) => {
       setOption({
         tooltip: {
           trigger: 'axis',
@@ -71,13 +76,13 @@ export default (props) => {
         ]
       })
     })
-  }, [orgId]);
+  }, []);
 
   return (
     <Card
       title="交办统计"
       extra={
-        <Select style={{ width: "200px" }} placeholder="请选择单位" value={orgId} onChange={e => setOrgId(e)}>
+        <Select style={{ width: "200px" }} value={orgId} placeholder="请选择单位" onChange={onChange}>
           {
             orgList.map((item) => (
               <Select.Option key={item.orgId} value={item.orgId}>

src/pages/home/components/RangeDate.jsx

@@ -14,17 +14,20 @@ export default (props) => {
   const dtTypeRef = React.useRef(dtType);
 
   const onRadioChange = e => {
+    //本周 本月 本年的value 1 2 3
     const value = e.target.value;
     setDtType(value);
+    //获取最新的dtType
     dtTypeRef.current = value;
-    console.log('dtTypeRef.current', dtTypeRef.current)
+    // console.log('dtTypeRef.current', dtTypeRef.current)
   }
 
-
+  //将日期数组的值set给pickerValue
   const onPickerChange = e => {
     setPickerValue(e);
   }
 
+  //按钮点击判断 本周 本月 本年的值set给pickerValue
   React.useEffect(() => {
     if (dtType == 1) {
       setPickerValue(

src/routes/routes.jsx

@@ -10,7 +10,9 @@ import {
   BranchesOutlined,
   NodeIndexOutlined,
   NotificationOutlined,
-  ScheduleOutlined
+  ScheduleOutlined,
+  FileTextOutlined,
+  HddOutlined
 } from '@ant-design/icons';
 import { Outlet } from 'react-router-dom';
 import AuthLayout from "@/layouts/AuthLayout";
@@ -36,6 +38,8 @@ import IssueList from '@/pages/issue';
 import IssueDetail from '@/pages/issue/detail';
 import Notice from '@/pages/notice';
 import CheckStand from '@/pages/checkStand';
+import FieldEvaluation from '@/pages/answerRecord/fieldEvaluation';
+import QuesInvestigation from '@/pages/answerRecord/QuesInvestigation';
 
 /**
  * meta 用来扩展自定义数据数据
@@ -95,7 +99,7 @@ export const authRoutes = [
           title: '模拟测评',
           icon: <ProjectOutlined />,
           permission: 'check',
-        }
+        },
       },
       {
         path: "check/edit",
@@ -107,6 +111,33 @@ export const authRoutes = [
           permission: 'check.edit',
         }
       },
+      {
+        path: "answerRecord",
+        element: <Outlet />,
+        meta: {
+          title: '答题记录',
+          icon: <FileTextOutlined />,
+        },
+        children:
+          [
+            {
+              path: "answerRecord/fieldEvaluation",
+              element: <FieldEvaluation />,
+              meta: {
+                title: '实地测评',
+                icon: <HddOutlined />,
+              }
+            },
+            {
+              path: "answerRecord/quesInvestigation",
+              element: <QuesInvestigation />,
+              meta: {
+                title: '问卷调查',
+                icon: <HddOutlined />,
+              }
+            },
+          ]
+      },
     ],
   },
   {