feats

src/pages/answerRecord/fieldEvaluation/index.jsx

@@ -1,60 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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/checkAnswer/loc/index.jsx

@@ -0,0 +1,106 @@
+import React from 'react';
+import { Button, notification } from "antd";
+import { ProTable } from "@ant-design/pro-components";
+import { useNavigate } from 'react-router-dom';
+import { queryTable, queryDict } from "@/utils/request";
+import Page from '@/components/Page';
+import { getTaCheck } from '@/service/tacheck';
+import { getTdLocType } from '@/service/tdloctype';
+import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
+import useBool from '@/utils/hooks/useBool';
+
+const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
+const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
+const getAnswer = queryTable(getTaCheckAnswer);
+
+export default (props) => {
+
+  const [loading, startLoading, stopLoading] = useBool();
+  const paramsRef = React.useRef();
+  const [notificationApi, contextHolder] = notification.useNotification();
+
+  const columns = [
+    {
+      title: "模拟测评",
+      dataIndex: "checkId",
+      valueType: 'select',
+      request: getCheck,
+      hideInTable: true,
+      formItemProps: {
+        rules: [
+          { required: true, message: '请选择模拟测评' }
+        ]
+      }
+    },
+    {
+      title: "点位名称",
+      valueType: 'select',
+      request: getLocType,
+      dataIndex: "typeId",
+    },
+    {
+      title: "问题",
+      dataIndex: "quTitle",
+      hideInSearch: true,
+    },
+    {
+      title: "答案",
+      dataIndex: "answer",
+      hideInSearch: true,
+    },
+    {
+      title: "答题时间",
+      dataIndex: "createDate",
+      valueType: 'date',
+      hideInSearch: true,
+    },
+    {
+      title: "答题人",
+      dataIndex: "userName",
+      hideInSearch: true,
+    },
+  ]
+
+  const beforeSearchSubmit = (params) => {
+    paramsRef.current = params;
+    return params;
+  }
+
+  const onExport = () => {
+    if (!paramsRef.current) {
+      notificationApi.warning({ message: '请先进行条件查询' });
+      return
+    }
+
+    startLoading();
+    exportTaCheckAnswer(paramsRef.current).then(() => {
+      stopLoading();
+    }).catch(() => {
+      stopLoading();
+    });
+  }
+
+  return (
+    <Page>
+      {contextHolder}
+      <ProTable
+        rowKey="answerItemId"
+        manualRequest
+        columns={columns}
+        request={getAnswer}
+        beforeSearchSubmit={beforeSearchSubmit}
+        form={{ ignoreRules: false }}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            loading={loading}
+            onClick={onExport}
+          >
+            导出
+          </Button>,
+        ]}
+      />
+    </Page>
+  )
+}

src/pages/checkAnswer/survey/index.jsx

@@ -0,0 +1,121 @@
+import React from 'react';
+import Page from '@/components/Page';
+import { useNavigate } from 'react-router-dom';
+import { queryTable, queryDict } from "@/utils/request";
+import { ProTable } from "@ant-design/pro-components";
+import { Button, notification } from "antd";
+import { getTaCheck } from '@/service/tacheck';
+import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
+import useBool from '@/utils/hooks/useBool';
+
+const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
+const getAnswer = queryTable(getTaCheckAnswer);
+
+const addOnParams = { itemType: 'survey' };
+
+export default (props) => {
+  const [loading, startLoading, stopLoading] = useBool();
+  const paramsRef = React.useRef();
+  const [notificationApi, contextHolder] = notification.useNotification();
+
+  const columns = [
+    {
+      title: "模拟测评",
+      dataIndex: "checkId",
+      valueType: 'select',
+      request: getCheck,
+      hideInTable: true,
+      formItemProps: {
+        rules: [
+          { required: true, message: '请选择模拟测评' }
+        ]
+      }
+    },
+    {
+      title: "社区",
+      dataIndex: "communityName",
+    },
+    {
+      title: "小区",
+      dataIndex: "addr",
+    },
+    {
+      title: "问题",
+      dataIndex: "quTitle",
+      hideInSearch: true,
+    },
+    {
+      title: "答案",
+      dataIndex: "answer",
+      hideInSearch: true,
+    },
+    {
+      title: "答题时间",
+      dataIndex: "createDate",
+      valueType: 'date',
+      hideInSearch: true,
+    },
+    {
+      title: "答题人",
+      dataIndex: "userName",
+      hideInSearch: true,
+    },
+    {
+      title: "受访者性别",
+      dataIndex: "sex",
+      hideInSearch: true,
+    },
+    {
+      title: "年龄段",
+      dataIndex: "age",
+      hideInSearch: true,
+    }
+  ]
+  
+  const beforeSearchSubmit = (params) => {
+    paramsRef.current = params;
+    return params;
+  }
+
+  const onExport = () => {
+    if (!paramsRef.current) {
+      notificationApi.warning({ message: '请先进行条件查询' });
+      return
+    }
+
+    startLoading();
+    exportTaCheckAnswer({
+      ...paramsRef.current,
+      ...addOnParams,
+    }).then(() => {
+      stopLoading();
+    }).catch(() => {
+      stopLoading();
+    });
+  }
+
+  return (
+    <Page>
+      {contextHolder}
+      <ProTable
+        rowKey="answerItemId"
+        manualRequest
+        columns={columns}
+        request={getAnswer}
+        params={addOnParams}
+        beforeSearchSubmit={beforeSearchSubmit}
+        form={{ ignoreRules: false }}
+        toolBarRender={() => [
+          <Button
+            key="1"
+            type="primary"
+            loading={loading}
+            onClick={onExport}
+          >
+            导出
+          </Button>,
+        ]}
+      />
+    </Page>
+  )
+}

src/routes/routes.jsx

@@ -40,8 +40,8 @@ import Notice from "@/pages/notice";
 
 import CheckStandList from "@/pages/checkStand/list";
 import CheckStandEdit from "@/pages/checkStand/edit";
-import FieldEvaluation from "@/pages/answerRecord/fieldEvaluation";
-import QuesInvestigation from "@/pages/answerRecord/QuesInvestigation";
+import CheckLocAnswer from "@/pages/checkAnswer/loc";
+import CheckSurveyAnswer from "@/pages/checkAnswer/survey";
 
 /**
  * meta 用来扩展自定义数据数据
@@ -114,7 +114,7 @@ export const authRoutes = [
         },
       },
       {
-        path: "answerRecord",
+        path: "checkAnswer",
         element: <Outlet />,
         meta: {
           title: "答题记录",
@@ -122,16 +122,16 @@ export const authRoutes = [
         },
         children: [
           {
-            path: "answerRecord/fieldEvaluation",
-            element: <FieldEvaluation />,
+            path: "loc",
+            element: <CheckLocAnswer />,
             meta: {
               title: "实地测评",
               icon: <HddOutlined />,
             },
           },
           {
-            path: "answerRecord/quesInvestigation",
-            element: <QuesInvestigation />,
+            path: "survey",
+            element: <CheckSurveyAnswer />,
             meta: {
               title: "问卷调查",
               icon: <HddOutlined />,

src/service/tacheckanswer.js

@@ -24,3 +24,8 @@ export const putTaCheckAnswer = (id, data) => request(`/api/taCheckAnswer/${id}`
  * 通过主键删除数据
  */
 export const deleteTaCheckAnswer = (id) => request(`/api/taCheckAnswer/${id}`, { method: 'delete' });
+
+/*
+ * 分页查询
+ */
+export const exportTaCheckAnswer = (params) => request('/api/taCheckAnswer/export', { params, download: true });

src/utils/hooks/useRequest.js

@@ -0,0 +1,20 @@
+import React from "react";
+
+export default (fn) => {
+  const [loading, setLoading] = React.useState(false);
+
+  const p = React.useCallback((...args) => {
+    return new Promise((resolve, reject) => {
+      setLoading(true);
+      fn(...args).then((res) => {
+        setLoading(false);
+        resolve(res);
+      }).catch((err) => {
+        setLoading(false);
+        reject(err)
+      })
+    })
+  }, []);
+
+  return [p, loading];
+}