样式调整

packages/examination/package.json

@@ -22,6 +22,7 @@
     "process": "^0.11.10",
     "quill-emoji": "^0.2.0",
     "react": "^17.0.0",
+    "react-countup": "^6.5.3",
     "react-dom": "^17.0.0",
     "react-qrcode-logo": "^3.0.0",
     "react-quill": "^1.3.5",

packages/examination/src/style/common.css

@@ -93,7 +93,7 @@ body {
 
 .special-class .ant-table-body{
   max-height: max-content !important;
-  overflow-y: hidden !important;
+  /*overflow-y: hidden !important;*/
 }
 
 .left{
@@ -133,6 +133,18 @@ body {
   font-weight: 600;
 }
 
+.ant-descriptions-header {
+  color: #323232;
+  margin-bottom: 15px;
+  border-left: 4px solid #7ea0f9;
+  padding-left: 10px;
+}
+
+.ant-descriptions-header .ant-descriptions-title {
+  font-size: medium;
+  font-weight: 600;
+}
+
 .list-filter {
   position: relative;
   margin: 0;
@@ -386,3 +398,10 @@ table.ikd-input-table {
   color: #ff4d4f !important;
   border-color: #ff4d4f !important;
 }
+.form_item_no_check label {
+  margin-left: 10px;
+}
+.main-customer-htm {
+  border: 1px solid #f1f3ff;
+  border-radius: 5px;
+}

packages/examination/src/utils/exportPdf.js

@@ -10,7 +10,7 @@ export const downPdf = (title,className) => {
       var mapIndex = index;
       html2canvas(elements[index], {
         useCORS: true, // 是否允许网页中img元素跨域，这个设置需要img元素支持及服务器支持
-        scale: 1, // 这个影响生成图片的清晰度
+        // scale: 1, // 这个影响生成图片的清晰度
         // background: "#F5F5F5" //背景
       }).then((canvas) => {
         var img = new Image();
@@ -34,9 +34,9 @@ export const downPdf = (title,className) => {
           // 所有图片添加完毕，保存
           pdf.save(title+".pdf");
         }
+        return true;
       });
     };
-    return true;
   });
 }
 

packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx

@@ -167,8 +167,9 @@ const ExamDetailAnalysisPage: React.FC = () => {
     });
 
     return (
-        <div style={{ padding: 20 }}>
-            {/* 检索条件行 */}
+        <div>
+            <div className="header-filter">
+                <div className="list-filter" style={{display: 'flex', padding: 15}}>
                     <Row gutter={16}>
                         <Col span={5}>
                             <span style={{ marginRight: 8 }}>考试名称:</span>
@@ -220,7 +221,8 @@ const ExamDetailAnalysisPage: React.FC = () => {
                             </Space>
                         </Col>
                     </Row>
-            {/* 表格 */}
+                </div>
+            </div>
             <Table
                 columns={columns}
                 dataSource={tableData}
@@ -230,7 +232,6 @@ const ExamDetailAnalysisPage: React.FC = () => {
                 onChange={handleTableChange}
                 style={{ marginTop: 20 }}
             />
-
             <Modal
                 title="成绩分布"
                 visible={visible}

packages/examination/src/views/exam-online/compoents/ExamEditPage.tsx

@@ -102,6 +102,7 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
         const formattedValues = {
             ...otherValues,
             id:values.examId,
+            industryId: values.regulatedIndustry,
             examRegion: formattedRegion,
             validFrom: formattedValidFrom,
             validTo: formattedValidTo
@@ -215,10 +216,8 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
             setPaperOptions(allPaperOptions);
         } else {
             const filteredPapers = allPaperOptions.filter(paper => String(paper.regulatedIndustry) === String(value));
-            if (filteredPapers.length > 0) {
             setPaperOptions(filteredPapers);
         }
-        }
 
         // @ts-ignore
         formRef.current.setFieldsValue({ paperId: '' }); // 清空试卷选择
@@ -239,14 +238,15 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
     const validateValidTo = (rule: Rule, value: Moment | null) => {
         const validFrom = formRef.current?.getFieldValue('validFrom');
         if (validFrom && value && value.isBefore(validFrom)) {
-            return Promise.reject(new Error('考试失效时间不得小于考试有效时间'));
+            return Promise.reject(new Error('考试失效日期不得小于考试有效日期'));
         }
         return Promise.resolve();
     };
 
     return (
-        <div>
-            <h1>考试基本信息</h1>
+        <div className="header-filter">
+            <div className="list-filter" style={{padding: 15}}>
+                <div className="ikd-page-header"><div className="title">考试基本信息</div></div>
                 <Form
                     ref={formRef}
                     {...props}
@@ -308,10 +308,10 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
                             ))}
                         </Select>
                     </Form.Item>
-                <Form.Item label="考试分值" name="examScore">
+                    <Form.Item label="考试分值" name="examScore" className="form_item_no_check">
                         <Input disabled />
                     </Form.Item>
-                <Form.Item label="考试时长" name="examDuration">
+                    <Form.Item label="考试时长" name="examDuration" className="form_item_no_check">
                         <Input disabled />
                     </Form.Item>
                     <Form.Item
@@ -330,12 +330,12 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
                         />
                     </Form.Item>
                     <Form.Item
-                    label="考试有效时间"
+                        label="考试有效日期"
                         name="validFrom"
                         rules={[
                             {
                                 required: true,
-                            message: '请选择考试有效时间',
+                                message: '请选择考试有效日期',
                             },
                         ]}
                     >
@@ -357,7 +357,7 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
                     <Form.Item
                         label="内容描述"
                         name="remark"
-                >
+                        className="form_item_no_check">
                         <Input.TextArea rows={4} maxLength={200} showCount/>
                     </Form.Item>
                     <Form.Item wrapperCol={{ ...wrapperCol, offset: labelCol.span }}>
@@ -369,6 +369,7 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
                     </Form.Item>
                 </Form>
             </div>
+        </div>
     );
 };
 

packages/examination/src/views/exam-online/compoents/ExamListPage.tsx

@@ -107,11 +107,12 @@ const ExamListPage = ({ history }: { history: any }) => {
             title: '确认删除',
             content: '你确定要删除这些选中的考试吗？',
             onOk: () => {
-                const res = doDelete(ids);
+                doDelete(ids).then(res => {
                     if (!res) {
                         return;
                     }
                     research();
+                }).catch(() => { })
             },
             onCancel: () => {
             },
@@ -142,11 +143,12 @@ const ExamListPage = ({ history }: { history: any }) => {
                 const validIds = validExams.map(exam => String(exam.examId));
 
                 if (validIds.length > 0) {
-                    const res = doCancel(validIds);
+                    doCancel(validIds).then(res => {
                         if (!res) {
                             return;
                         }
                         research();
+                    }).catch(() => { })
                 }
             },
             onCancel: () => {
@@ -178,11 +180,12 @@ const ExamListPage = ({ history }: { history: any }) => {
                 const validIds = validExams.map(exam => String(exam.examId));
 
                 if (validIds.length > 0) {
-                    const res = doPublish(validIds);
+                    doPublish(validIds).then(res => {
                         if (!res) {
                             return;
                         }
                         research();
+                    }).catch(() => { })
                 }
             },
             onCancel: () => {
@@ -238,11 +241,12 @@ const ExamListPage = ({ history }: { history: any }) => {
             content: '你确定要发布这个考试吗？',
             onOk: () => {
                 const ids = [String(examId)];
-                const res = doPublish(ids);
+                doPublish(ids).then(res => {
                     if (!res) {
                         return;
                     }
                     research();
+                }).catch(() => { })
             },
             onCancel: () => {
             },
@@ -256,11 +260,12 @@ const ExamListPage = ({ history }: { history: any }) => {
             content: '你确定要撤回这个考试吗？',
             onOk: () => {
                 const ids = [String(examId)];
-                const res = doCancel(ids);
+                doCancel(ids).then(res => {
                     if (!res) {
                         return;
                     }
                     research();
+                }).catch(() => { })
             },
             onCancel: () => {
             },
@@ -274,11 +279,12 @@ const ExamListPage = ({ history }: { history: any }) => {
             content: '你确定要删除这个考试吗？',
             onOk: () => {
                 const ids = [String(examId)];
-                const res =  doDelete(ids);
+                doDelete(ids).then(res => {
                     if (!res) {
                         return;
                     }
                     research();
+                }).catch(() => { })
             },
             onCancel: () => {
             },
@@ -363,7 +369,7 @@ const ExamListPage = ({ history }: { history: any }) => {
             key: 'validFrom',
         },
         {
-            title: '考试无效日期',
+            title: '考试失效日期',
             dataIndex: 'validTo',
             key: 'validTo',
         },
@@ -395,7 +401,7 @@ const ExamListPage = ({ history }: { history: any }) => {
             render: (cellValue: number, record: Exam) => (
                 <Space size="middle">
                     <a onClick={() => handleEdit(record.examId)}>编辑</a>
-                    {record.publishStatus === 1 ? (
+                    {record.publishStatus === 1 && (
                         <a onClick={(e) => {
                             if (record.publishStatus !== 1) {
                                 e.preventDefault();
@@ -405,21 +411,12 @@ const ExamListPage = ({ history }: { history: any }) => {
                         }}
                     >
                         生成考试码
-                    </a>) : (
-                        <span style={{ color: 'gray' }} >生成考试码</span>
-                    )}
-                    {/*<a onClick={(e) => {*/}
-                    {/*    handleGenerateQrCode(record);*/}
-                    {/*}}*/}
-                    {/*>*/}
-                    {/*    生成考试码*/}
-                    {/*</a>*/}
-                    {record.publishStatus === 0 ? (
+                    </a>)}
+                    {record.publishStatus === 0 || record.publishStatus === 2 && (
                         <a onClick={() => handlePublishSingle(record.examId)}>发布</a>
-                    ) : record.publishStatus === 1 ? (
+                    )}
+                    {record.publishStatus === 1 && (
                         <a onClick={() => handleWithdrawSingle(record.examId)}>撤回</a>
-                    ) : (
-                        <span style={{ color: 'gray' }}>撤回</span>
                     )}
                     <a onClick={() => handleDeleteSingle(record.examId)}>删除</a>
                 </Space>

packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx

@@ -141,25 +141,26 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
     ];
 
     return (
-        <div style={{ padding: 20 }}>
-            {/* 检索条件行 */}
-            <Row gutter={16}>
-                <Col span={6}>
+        <div>
+            <div className="header-filter">
+                <div className="list-filter" style={{ padding: 15}}>
+                    <Row gutter={24}>
+                        <Col span={8}>
                             <span style={{ marginRight: 8 }}>试卷名称:</span>
                             <Input
                                 placeholder="试卷名称"
                                 value={paperName}
                                 onChange={(e) => setPaperName(e.target.value)}
-                        style={{ width: 'calc(100% - 100px)' }}
+                                style={{ width: 300 }}
                             />
                         </Col>
-                <Col span={6}>
+                        <Col span={8}>
                             <span style={{ marginRight: 8 }}>监管行业:</span>
                             <Select
                                 placeholder="监管行业"
                                 value={industry}
                                 onChange={(value) => setIndustry(value)}
-                        style={{ width: 150 }}
+                                style={{ width: 300 }}
                             >
                                 <Option key="" value="">全部</Option>
                                 {industryOptions.map((option) => (
@@ -169,20 +170,21 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
                                 ))}
                             </Select>
                         </Col>
-                <Col span={4}>
+                        <Col span={8}>
                             <Space>
                                 <Button onClick={handleReset}>重置</Button>
                                 <Button type="primary" onClick={handleSearch}>查询</Button>
                             </Space>
                         </Col>
                     </Row>
-            {/* 试卷数量行 */}
+                </div>
+            </div>
             <Row gutter={24} style={{ marginTop: 40 }}>
                 <Col span={8}>
                     <div className="exam-statistic-box">
                         <div className="exam-statistic">
                             <span style={{ color: 'black' }}>总计</span>
-                            <span style={{ color: '#86A3E7' }}>{totalCount}</span>
+                            <span style={{ color: '#86A3E7', margin: 10 }}>{totalCount}</span>
                             <span style={{ color: 'black' }}>套</span>
                         </div>
                     </div>
@@ -191,7 +193,7 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
                     <div className="exam-statistic-box">
                         <div className="exam-statistic">
                             <span style={{ color: 'black' }}>已使用</span>
-                            <span style={{ color: '#86A3E7' }}>{usedCount}</span>
+                            <span style={{ color: '#86A3E7', margin: 10 }}>{usedCount}</span>
                             <span style={{ color: 'black' }}>套</span>
                         </div>
                     </div>
@@ -200,7 +202,7 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
                     <div className="exam-statistic-box">
                         <div className="exam-statistic">
                             <span style={{ color: 'black' }}>停用</span>
-                            <span style={{ color: '#86A3E7' }}>{disabledCount}</span>
+                            <span style={{ color: '#86A3E7', margin: 10 }}>{disabledCount}</span>
                             <span style={{ color: 'black' }}>套</span>
                         </div>
                     </div>

packages/examination/src/views/exam-online/compoents/ExamStatisticsPage.tsx

@@ -1,10 +1,10 @@
+import CountUp from 'react-countup';
 import React, { useEffect, useState, useRef } from 'react';
 import { Row, Col, Select, Table, Card } from 'antd';
 import ReactECharts from 'echarts-for-react';
 import {examStatisticsChange, examStatisticsInit, getIndustryList} from "api/exam-online/index"; // 修改接口为获取带详情的试卷列表
 import { Link } from 'react-router-dom';
 const { Option } = Select;
-
 const examTableColumns = [
     {
         title: '考试次数',
@@ -214,17 +214,29 @@ const Dashboard: React.FC = () => {
             <Row gutter={16}>
                 <Col span={8}>
                     <div className="exam-statistic-box">
-                        <div className="exam-statistic">试题<span style={{color:"#86A3E7"}}>{questionCount}</span>条</div>
+                        <div className="exam-statistic">试题
+                            <span style={{color:"#86A3E7", margin: 10}}>
+                                <CountUp end={questionCount as number} separator="," duration={2}/>
+                            </span>条
+                        </div>
                     </div>
                 </Col>
                 <Col span={8}>
                     <div className="exam-statistic-box">
-                        <div className="exam-statistic">试卷<span style={{color:"#86A3E7"}}>{paperCount}</span>套</div>
+                        <div className="exam-statistic">试卷
+                            <span style={{color: "#86A3E7", margin: 10}}>
+                                <CountUp end={paperCount as number} separator="," duration={2}/>
+                            </span>套
+                        </div>
                     </div>
                 </Col>
                 <Col span={8}>
                     <div className="exam-statistic-box">
-                        <div className="exam-statistic">考试<span style={{color:"#86A3E7"}}>{examCount}</span>次</div>
+                        <div className="exam-statistic">考试
+                            <span style={{color:"#86A3E7", margin: 10}}>
+                                <CountUp end={examCount as number} separator="," duration={2}/>
+                            </span>次
+                        </div>
                     </div>
                 </Col>
             </Row>

packages/examination/src/views/statistical/enterpriseFile.tsx

@@ -356,8 +356,8 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
     const columnsHivePolicyInnerCoInsurer = [
         {
             title: '联保机构',
-            dataIndex: 'innerCoOrgCode',
-            key: 'innerCoOrgCode',
+            dataIndex: 'orgName',
+            key: 'orgName',
         },
         {
             title: '联保份额',
@@ -475,18 +475,24 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
         },
     ];
     const handleCapture = () => {
-        setLoading(true);
         setDownloadStat(true);
-        setTimeout(function () {
-            downPdf("企业档案", "main-customer-htm").then(() => {
+        setLoading(true);
+        setTimeout(() => {
+            downPdf("企业档案", "main-customer-htm")
+                .then(() => {
                     console.log("PDF已经生成并保存！");
-            }).catch((error: any) => {
+                    setLoading(false);
+                    setDownloadStat(false);
+                })
+                .catch((error: any) => {
                     console.error("生成PDF时发生错误: ", error);
-            });
                     setLoading(false);
                     setDownloadStat(false);
+                });
         }, 7000);
-    }
+        // }, 200);
+    };
+
     return (
         <div>
             <div style={{ height: 40 }}>
@@ -506,8 +512,10 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
                         textAlign: 'center',
                         display: 'flex',
                         alignItems: 'center'
-                    }}>企业档案</div></div>
+                    }}>{customer.customerName}企业档案</div></div>
                 <div>
+                    <div className={downloadStat? 'asd': 'header-filter'} style={downloadStat?{}:{width: '99%', marginLeft: '0.5%'}}>
+                        <div className={downloadStat? 'asd': 'list-filter'} style={downloadStat?{}:{display: 'flex', padding: 7}}>
                             <Descriptions title="企业基本信息">
                                     {items.map(item => (
                                         <Descriptions.Item label={item.label} key={item.key}>
@@ -515,7 +523,10 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
                                         </Descriptions.Item>
                                     ))}
                             </Descriptions>
-                    <br />
+                        </div>
+                    </div>
+                    <div className={downloadStat? 'asd': 'header-filter'} style={downloadStat?{}:{width: '99%', marginLeft: '0.5%'}}>
+                        <div className={downloadStat? 'asd': 'list-filter'} style={downloadStat?{}:{padding: 7}}>
                             <div className="ant-descriptions-header">
                                 <div className="ant-descriptions-title">保单信息</div>
                             </div>
@@ -559,7 +570,10 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
                                     <br />
                                 </div>
                             ))}
-                    <br />
+                        </div>
+                    </div>
+                    <div className={downloadStat? 'asd': 'header-filter'} style={downloadStat?{}:{width: '99%', marginLeft: '0.5%'}}>
+                        <div className={downloadStat? 'asd': 'list-filter'} style={downloadStat?{}:{padding: 7}}>
                             <div className="ant-descriptions-header">
                                 <div className="ant-descriptions-title">理赔记录</div>
                             </div>
@@ -599,7 +613,10 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
                                     </Descriptions>
                                 </div>
                             ))}
-                    <br />
+                        </div>
+                    </div>
+                    <div className={downloadStat? 'asd': 'header-filter'} style={downloadStat?{}:{width: '99%', marginLeft: '0.5%'}}>
+                        <div className={downloadStat? 'asd': 'list-filter'} style={downloadStat?{}:{padding: 7}}>
                             <div className="ant-descriptions-header">
                                 <div className="ant-descriptions-title">服务记录</div>
                             </div>
@@ -648,6 +665,8 @@ const EnterpriseFile: React.FC<CustomerRetentionProps> = ({ customer }) => {
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
     );
 };