+
- headerTitle="历次考试成绩统计"
- actionRef={actionRef}
- rowKey="key"
- search={false}
- options={false}
- toolBarRender={() => [
- ,
- ]}
- request={rule}
- columns={columns}
- rowSelection={false}
- />
-
+ headerTitle="历次考试成绩统计"
+ actionRef={actionRef}
+ rowKey="key"
+ search={false}
+ options={false}
+ toolBarRender={() => [
+
,
+ ]}
+ request={async (value) => {
+ const _data = await getExaminationPersonStatistics({ sort_type: 0, sort_colum: 1 });
+ return {
+ data: _data?.list,
+ };
+ }}
+ columns={columns}
+ rowSelection={false}
+ />
+
);
};
diff --git a/admin/src/pages/history/analysis/components/CertificateRow.tsx b/admin/src/pages/history/analysis/components/CertificateRow.tsx
index 424b421..58f11a3 100644
--- a/admin/src/pages/history/analysis/components/CertificateRow.tsx
+++ b/admin/src/pages/history/analysis/components/CertificateRow.tsx
@@ -5,13 +5,12 @@ import React, { useState, useRef } from 'react';
import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
import type { ProColumns, ActionType } from '@ant-design/pro-table';
import ProTable from '@ant-design/pro-table';
-import { ModalForm, ProFormText, ProFormTextArea } from '@ant-design/pro-form';
-import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
-import ProDescriptions from '@ant-design/pro-descriptions';
+import { getCredentialPersonStatistics } from '../service';
import { rule } from '../service';
import type { TableListItem, TableListPagination } from '../data';
-import { FormValueType } from '@/pages/ListTableList2/components/UpdateForm2';
+import type { FormValueType } from '@/pages/ListTableList2/components/UpdateForm2';
+import cookie from 'react-cookies';
/**
* 添加
@@ -96,54 +95,41 @@ const TableList: React.FC = () => {
{
title: '序号',
key: 'index',
- valueType: 'indexBorder',
+ valueType: 'indexBorder',
width: 48,
},
{
title: '市州',
- dataIndex: 'name',
+ dataIndex: 'city_name',
valueType: 'text',
},
{
title: '参加学习人数',
- dataIndex: 'callNo',
- sorter: true,
+ dataIndex: 'learning_person_number',
+ // sorter: true,
hideInForm: true,
renderText: (val: string) => `${val}`,
},
{
title: '学习完成率',
- dataIndex: 'callNo',
- sorter: true,
+ dataIndex: 'completion_rate',
+ // sorter: true,
hideInForm: true,
renderText: (val: string) => `${val}%`,
},
{
title: '取得资质证书人数',
- sorter: true,
- dataIndex: 'callNo',
+ sorter: false,
+ dataIndex: 'count',
valueType: 'text',
- renderFormItem: (item, { defaultRender, ...rest }, form) => {
- const status = form.getFieldValue('status');
-
- if (`${status}` === '0') {
- return false;
- }
-
- if (`${status}` === '3') {
- return