From 90bad9816a174db8dedb03fd9147f73e0797bb8d Mon Sep 17 00:00:00 2001
From: liuyiliang <yiliang.liu@51dayu.com.cn>
Date: Thu, 27 Mar 2025 10:53:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/examination/src/style/common.css     |   4 +
 .../exam-online/compoents/ExamListPage.tsx    | 226 ++++++++---------
 .../src/views/examPaper/examPaperList.tsx     | 182 +++++++-------
 .../src/views/question/questionList.tsx       | 228 +++++++++---------
 .../views/statistical/serviceStatistics.tsx   |   4 +-
 5 files changed, 333 insertions(+), 311 deletions(-)

diff --git a/packages/examination/src/style/common.css b/packages/examination/src/style/common.css
index 59f9159..2f7a5a2 100644
--- a/packages/examination/src/style/common.css
+++ b/packages/examination/src/style/common.css
@@ -381,4 +381,8 @@ table.ikd-input-table {
   display: flex;
   height: 100%;
   font-size: x-large;
+}
+.ant-btn-dangerous {
+  color: #ff4d4f !important;
+  border-color: #ff4d4f !important;
 }
\ No newline at end of file
diff --git a/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx
index 3370545..0617c46 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx
@@ -472,119 +472,125 @@ const ExamListPage = ({ history }: { history: any }) => {
     }
 
     return (
-        <div className="list-filter">
-            <Form
-                //ref={this.formRef}
-                className="filter"
-                layout="inline"
-            >
-                <Form.Item
-                    label="考试名称："
-                >
-                    <Input
-                        placeholder="请输入考试名称"
-                        value={searchForm.examName}
-                        onChange={(e) =>
-                            setSearchForm({...searchForm, examName: e.target.value})
-                        }
-                        style={{width: 240}}
-                    />
-                </Form.Item>
-                <Form.Item
-                    label="试卷名称："
-                >
-                    <Input
-                        placeholder="请输入试卷名称"
-                        value={searchForm.paperName}
-                        onChange={(e) =>
-                            setSearchForm({...searchForm, paperName: e.target.value})
-                        }
-                        style={{width: 240}}
-                    />
-                </Form.Item>
-                <Form.Item
-                    label="监管行业："
-                >
-                    <Select
-                        placeholder="监管行业"
-                        value={searchForm.regulatedIndustry}
-                        onChange={(value) =>
-                            setSearchForm({...searchForm, regulatedIndustry: value})
-                        }
-                        style={{width: 240}}
-                    >
-                        <Option key="" value="">全部</Option>
-                        {industryOptions.map(option => (
-                            <Option key={option.value} value={option.value}>
-                                {option.label}
-                            </Option>
-                        ))}
-                    </Select>
-                </Form.Item>
-                <Form.Item
-                    label="考试有效日期："
-                >
-                    <DatePicker
-                        value={searchForm.validTime} // 使用 Moment 类型
-                        onChange={(value: Moment | null) =>
-                            setSearchForm({...searchForm, validTime: value})
-                        }
-                        style={{width: 240}}
-                    />
-                </Form.Item>
-                <Form.Item>
-                    <Button onClick={handleReset}>重置</Button>
-                </Form.Item>
-                <Form.Item>
-                    <Button onClick={() => handleSearch(1)} type="primary" style={{marginLeft: 8}}>
-                        查询
-                    </Button>
-                </Form.Item>
-            </Form>
-            <div style={{marginBottom: 16, textAlign: "right"}}>
-                <Button onClick={handleDeleteSelected} danger>
-                    删除
-                </Button>
-                <Button onClick={handleWithdrawSelected} style={{marginLeft: 8}}>
-                    撤回
-                </Button>
-                <Button onClick={handlePublishSelected} style={{marginLeft: 8}}>
-                    发布
-                </Button>
-                <Button onClick={handleAddExam} type="primary" style={{marginLeft: 8}}>
-                    新增考试
-                </Button>
-            </div>
-            <Table
-                columns={columns}
-                loading={loading}
-                dataSource={currentPageExamList}
-                rowKey="examId"
-                pagination={pagination}
-                bordered={true}
-                size={'small'}
-                onChange={handleTableChange}
-            />
-            <Modal
-                title={<div style={{ textAlign: 'center' }}>生成考试码</div>}
-                visible={qrCodeVisible}
-                onCancel={() => setQrCodeVisible(false)}
-                onOk={handleDownloadQRCode}
-                centered
-                okText="确认"
-            >
-                <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '20px' }}>
-                    <div ref={qrCodeRef} className="qrCodeRef">
-                        <QRCode value={'https://4s27589r64.zicp.fun/wx/'+qrCodeData} size={200} fgColor="#000000" ecLevel="H"/>
-                        <div className="overlay">
-                            <a onClick={() => handleRefreshQRCode(examId)} className="refresh-link"><UndoOutlined />点击刷新</a>
-                        </div>
+        <div className="container">
+            <div>
+                <div className="header-filter">
+                    <div className="list-filter" style={{display: 'flex', padding: 15}}>
+                        <Form
+                            //ref={this.formRef}
+                            className="filter"
+                            layout="inline"
+                        >
+                            <Form.Item
+                                label="考试名称："
+                            >
+                                <Input
+                                    placeholder="请输入考试名称"
+                                    value={searchForm.examName}
+                                    onChange={(e) =>
+                                        setSearchForm({...searchForm, examName: e.target.value})
+                                    }
+                                    style={{width: 240}}
+                                />
+                            </Form.Item>
+                            <Form.Item
+                                label="试卷名称："
+                            >
+                                <Input
+                                    placeholder="请输入试卷名称"
+                                    value={searchForm.paperName}
+                                    onChange={(e) =>
+                                        setSearchForm({...searchForm, paperName: e.target.value})
+                                    }
+                                    style={{width: 240}}
+                                />
+                            </Form.Item>
+                            <Form.Item
+                                label="监管行业："
+                            >
+                                <Select
+                                    placeholder="监管行业"
+                                    value={searchForm.regulatedIndustry}
+                                    onChange={(value) =>
+                                        setSearchForm({...searchForm, regulatedIndustry: value})
+                                    }
+                                    style={{width: 240}}
+                                >
+                                    <Option key="" value="">全部</Option>
+                                    {industryOptions.map(option => (
+                                        <Option key={option.value} value={option.value}>
+                                            {option.label}
+                                        </Option>
+                                    ))}
+                                </Select>
+                            </Form.Item>
+                            <Form.Item
+                                label="考试有效日期："
+                            >
+                                <DatePicker
+                                    value={searchForm.validTime} // 使用 Moment 类型
+                                    onChange={(value: Moment | null) =>
+                                        setSearchForm({...searchForm, validTime: value})
+                                    }
+                                    style={{width: 240}}
+                                />
+                            </Form.Item>
+                            <Form.Item>
+                                <Button onClick={handleReset}>重置</Button>
+                            </Form.Item>
+                            <Form.Item>
+                                <Button onClick={() => handleSearch(1)} type="primary" style={{marginLeft: 8}}>
+                                    查询
+                                </Button>
+                            </Form.Item>
+                        </Form>
                     </div>
                 </div>
-                <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '20px',fontWeight: 'bolder', fontSize: 'larger' }}>
-                    <span>验证码：{captcha}</span>
+                <div style={{marginBottom: 16, textAlign: "right"}}>
+                    <Button onClick={handleDeleteSelected} danger>
+                        删除
+                    </Button>
+                    <Button onClick={handleWithdrawSelected} style={{marginLeft: 8}}>
+                        撤回
+                    </Button>
+                    <Button onClick={handlePublishSelected} style={{marginLeft: 8}}>
+                        发布
+                    </Button>
+                    <Button onClick={handleAddExam} type="primary" style={{marginLeft: 8}}>
+                        新增考试
+                    </Button>
                 </div>
-            </Modal>
+                <Table
+                    columns={columns}
+                    loading={loading}
+                    dataSource={currentPageExamList}
+                    rowKey="examId"
+                    pagination={pagination}
+                    bordered={true}
+                    size={'small'}
+                    onChange={handleTableChange}
+                />
+                <Modal
+                    title={<div style={{ textAlign: 'center' }}>生成考试码</div>}
+                    visible={qrCodeVisible}
+                    onCancel={() => setQrCodeVisible(false)}
+                    onOk={handleDownloadQRCode}
+                    centered
+                    okText="确认"
+                >
+                    <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '20px' }}>
+                        <div ref={qrCodeRef} className="qrCodeRef">
+                            <QRCode value={'https://4s27589r64.zicp.fun/wx/'+qrCodeData} size={200} fgColor="#000000" ecLevel="H"/>
+                            <div className="overlay">
+                                <a onClick={() => handleRefreshQRCode(examId)} className="refresh-link"><UndoOutlined />点击刷新</a>
+                            </div>
+                        </div>
+                    </div>
+                    <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '20px',fontWeight: 'bolder', fontSize: 'larger' }}>
+                        <span>验证码：{captcha}</span>
+                    </div>
+                </Modal>
+            </div>
         </div>
     );
 };
diff --git a/packages/examination/src/views/examPaper/examPaperList.tsx b/packages/examination/src/views/examPaper/examPaperList.tsx
index 37ace56..4825e56 100644
--- a/packages/examination/src/views/examPaper/examPaperList.tsx
+++ b/packages/examination/src/views/examPaper/examPaperList.tsx
@@ -349,95 +349,101 @@ class ExamPaperList extends Component<any, States> {
         ];
 
         return (
-            <div className="list-filter">
-                <Form
-                    ref={this.formRef}
-                    className="filter"
-                    layout="inline"
-                >
-                    <Form.Item
-                        label="监管行业："
-                        name="industryId"
+            <div className="container">
+                <div>
+                    <div className="header-filter">
+                        <div className="list-filter" style={{display: 'flex', padding: 15}}>
+                            <Form
+                                ref={this.formRef}
+                                className="filter"
+                                layout="inline"
+                            >
+                            <Form.Item
+                                label="监管行业："
+                                name="industryId"
+                            >
+                                <Select
+                                    placeholder="请选择监管行业"
+                                    style={{ width: 240 }}
+                                    allowClear
+                                >
+                                    {
+                                        industryDict && industryDict.length > 0?
+                                            (() => {
+                                                let rows = [];
+                                                for (let i = 0; i < industryDict.length; i++) {
+                                                    const item = industryDict[i];
+                                                    rows.push(
+                                                        <Option value={item.industryId}>{item.industryName}</Option>
+                                                    );
+                                                }
+                                                return rows;
+                                            })()
+                                            :
+                                            <Option disabled>暂无数据</Option>
+                                    }
+                                </Select>
+                            </Form.Item>
+                            <Form.Item
+                                label="试卷名称："
+                                name="paperName"
+                            >
+                                <Input placeholder="请输入试卷名称" style={{ width: 240 }} />
+                            </Form.Item>
+                            <Form.Item>
+                                <Button type="default" onClick={this.handleReset}>重置</Button>
+                            </Form.Item>
+                            <Form.Item>
+                                <Button type="primary" htmlType="submit" onClick={() => {
+                                    this.handlegetList('init');
+                                }}>查询</Button>
+                            </Form.Item>
+                        </Form>
+                        </div>
+                    </div>
+                    <Form
+                        className="filter"
+                        layout="inline"
+                        style={{ justifyContent: 'flex-end' }}
                     >
-                        <Select
-                            placeholder="请选择监管行业"
-                            style={{ width: 240 }}
-                            allowClear
-                        >
-                            {
-                                industryDict && industryDict.length > 0?
-                                    (() => {
-                                        let rows = [];
-                                        for (let i = 0; i < industryDict.length; i++) {
-                                            const item = industryDict[i];
-                                            rows.push(
-                                                <Option value={item.industryId}>{item.industryName}</Option>
-                                            );
-                                        }
-                                        return rows;
-                                    })()
-                                    :
-                                    <Option disabled>暂无数据</Option>
-                            }
-                        </Select>
-                    </Form.Item>
-                    <Form.Item
-                        label="试卷名称："
-                        name="paperName"
-                    >
-                        <Input placeholder="请输入试卷名称" style={{ width: 240 }} />
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="default" onClick={this.handleReset}>重置</Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="primary" htmlType="submit" onClick={() => {
-                            this.handlegetList('init');
-                        }}>查询</Button>
-                    </Form.Item>
-                </Form>
-                <Form
-                    className="filter"
-                    layout="inline"
-                    style={{ justifyContent: 'flex-end' }}
-                >
-                    <Form.Item>
-                        <Button type="default" onClick={this.handleBatchDeleteExamPaper}>删除</Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="default" onClick={() => this.handleBatchUpdatePaperStatus(1)}>停用</Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="default" onClick={() => this.handleBatchUpdatePaperStatus(0)}>启用</Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="primary" onClick={() => { this.props.history.push(`/examPaperAdd`); }}>新增试卷</Button>
-                    </Form.Item>
-                </Form>
-                <Table
-                    dataSource={list}
-                    columns={columns}
-                    rowKey="id"
-                    bordered={true}
-                    size={'small'}
-                    loading={loading}
-                    scroll={{ y: 500 }}
-                    rowSelection={{
-                        selectedRowKeys: selectedRowKeys,
-                        onChange: this.handleOnChange,
-                        getCheckboxProps: () => ({
-                            disabled: false
-                        })
-                    }}
-                    pagination={{
-                        total: this.state.total,
-                        current: this.state.page,
-                        showQuickJumper: true,
-                        showSizeChanger: true,
-                        showTotal: (total) => `共 ${total} 条`,
-                        onChange: changePage
-                    }}
-                />
+                        <Form.Item>
+                            <Button type="default" onClick={this.handleBatchDeleteExamPaper} danger>删除</Button>
+                        </Form.Item>
+                        <Form.Item>
+                            <Button type="default" onClick={() => this.handleBatchUpdatePaperStatus(1)}>停用</Button>
+                        </Form.Item>
+                        <Form.Item>
+                            <Button type="default" onClick={() => this.handleBatchUpdatePaperStatus(0)}>启用</Button>
+                        </Form.Item>
+                        <Form.Item>
+                            <Button type="primary" onClick={() => { this.props.history.push(`/examPaperAdd`); }}>新增试卷</Button>
+                        </Form.Item>
+                    </Form>
+                    <Table
+                        dataSource={list}
+                        columns={columns}
+                        rowKey="id"
+                        bordered={true}
+                        size={'small'}
+                        loading={loading}
+                        scroll={{ y: 500 }}
+                        rowSelection={{
+                            selectedRowKeys: selectedRowKeys,
+                            onChange: this.handleOnChange,
+                            getCheckboxProps: () => ({
+                                disabled: false
+                            })
+                        }}
+                        pagination={{
+                            total: this.state.total,
+                            current: this.state.page,
+                            showQuickJumper: true,
+                            showSizeChanger: true,
+                            showTotal: (total) => `共 ${total} 条`,
+                            onChange: changePage
+                        }}
+                    />
+                </div>
             </div>
         );
     }
diff --git a/packages/examination/src/views/question/questionList.tsx b/packages/examination/src/views/question/questionList.tsx
index 12c4149..8b28b0a 100644
--- a/packages/examination/src/views/question/questionList.tsx
+++ b/packages/examination/src/views/question/questionList.tsx
@@ -281,120 +281,126 @@ class QuestionList extends Component<any, States> {
         ];
 
         return (
-            <div className="list-filter">
-                <Form
-                    ref={this.formRef}
-                    className="filter"
-                    layout="inline"
-                >
-                    <Form.Item
-                        label="监管行业："
-                        name="industryId"
-                    >
-                        <Select
-                            placeholder="请选择监管行业"
-                            style={{ width: 240 }}
-                            allowClear
-                        >
-                            {
-                                industryDict && industryDict.length > 0?
-                                    (() => {
-                                        let rows = [];
-                                        for (let i = 0; i < industryDict.length; i++) {
-                                            const item = industryDict[i];
-                                            rows.push(
-                                                <Option value={item.industryId}>{item.industryName}</Option>
-                                            );
+            <div className="container">
+                <div>
+                    <div className="header-filter">
+                        <div className="list-filter" style={{display: 'flex', padding: 15}}>
+                            <Form
+                                ref={this.formRef}
+                                className="filter"
+                                layout="inline"
+                            >
+                                <Form.Item
+                                    label="监管行业："
+                                    name="industryId"
+                                >
+                                    <Select
+                                        placeholder="请选择监管行业"
+                                        style={{ width: 240 }}
+                                        allowClear
+                                    >
+                                        {
+                                            industryDict && industryDict.length > 0?
+                                                (() => {
+                                                    let rows = [];
+                                                    for (let i = 0; i < industryDict.length; i++) {
+                                                        const item = industryDict[i];
+                                                        rows.push(
+                                                            <Option value={item.industryId}>{item.industryName}</Option>
+                                                        );
+                                                    }
+                                                    return rows;
+                                                })()
+                                                :
+                                                <Option disabled>暂无数据</Option>
                                         }
-                                        return rows;
-                                    })()
-                                    :
-                                    <Option disabled>暂无数据</Option>
-                            }
-                        </Select>
-                    </Form.Item>
-                    <Form.Item
-                        label="AQ服务类型："
-                        name="serviceTypeId"
-                    >
-                        <Select
-                            placeholder="请选择AQ服务类型"
-                            style={{ width: 240 }}
-                            allowClear
-                        >
-                            {
-                                serviceTypeDict && serviceTypeDict.length > 0?
-                                    (() => {
-                                        let rows = [];
-                                        for (let i = 0; i < serviceTypeDict.length; i++) {
-                                            const item = serviceTypeDict[i];
-                                            rows.push(
-                                                <Option value={item.dictKey}>{item.dictValue}</Option>
-                                            );
+                                    </Select>
+                                </Form.Item>
+                                <Form.Item
+                                    label="AQ服务类型："
+                                    name="serviceTypeId"
+                                >
+                                    <Select
+                                        placeholder="请选择AQ服务类型"
+                                        style={{ width: 240 }}
+                                        allowClear
+                                    >
+                                        {
+                                            serviceTypeDict && serviceTypeDict.length > 0?
+                                                (() => {
+                                                    let rows = [];
+                                                    for (let i = 0; i < serviceTypeDict.length; i++) {
+                                                        const item = serviceTypeDict[i];
+                                                        rows.push(
+                                                            <Option value={item.dictKey}>{item.dictValue}</Option>
+                                                        );
+                                                    }
+                                                    return rows;
+                                                })()
+                                                :
+                                                <Option disabled>暂无数据</Option>
                                         }
-                                        return rows;
-                                    })()
-                                    :
-                                    <Option disabled>暂无数据</Option>
-                            }
-                        </Select>
-                    </Form.Item>
-                    <Form.Item
-                        label="题干条件："
-                        name="questionContent"
+                                    </Select>
+                                </Form.Item>
+                                <Form.Item
+                                    label="题干条件："
+                                    name="questionContent"
+                                >
+                                    <Input
+                                        placeholder="请输入题干条件"
+                                        style={{ width: 240 }}
+                                    />
+                                </Form.Item>
+                                <Form.Item>
+                                    <Button type="default" onClick={this.handleReset}>重置</Button>
+                                </Form.Item>
+                                <Form.Item>
+                                    <Button type="primary" htmlType="submit" onClick={() => {
+                                        this.handlegetList('init');
+                                    }}>查询</Button>
+                                </Form.Item>
+                            </Form>
+                        </div>
+                    </div>
+                    <Form
+                        className="filter"
+                        layout="inline"
+                        style={{ justifyContent: 'flex-end' }}
                     >
-                        <Input
-                            placeholder="请输入题干条件"
-                            style={{ width: 240 }}
-                        />
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="default" onClick={this.handleReset}>重置</Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="primary" htmlType="submit" onClick={() => {
-                            this.handlegetList('init');
-                        }}>查询</Button>
-                    </Form.Item>
-                </Form>
-                <Form
-                    className="filter"
-                    layout="inline"
-                    style={{ justifyContent: 'flex-end' }}
-                >
-                    <Form.Item>
-                        <Button type="default" onClick={this.handleBatchDeleteQuestions}>删除</Button>
-                    </Form.Item>
-                    <Form.Item>
-                        <Button type="primary" onClick={() => {
-                            this.props.history.push('/questionAdd');
-                        }}>新增试题</Button>
-                    </Form.Item>
-                </Form>
-                <Table
-                    dataSource={list}
-                    columns={columns}
-                    rowKey="id"
-                    bordered={true}
-                    size={'small'}
-                    scroll={{ y: 500 }}
-                    loading={loading}
-                    rowSelection={{
-                        selectedRowKeys: selectedRowKeys,
-                        onChange: this.handleOnChange,
-                        getCheckboxProps: () => ({
-                            disabled: false
-                        })
-                    }}
-                    pagination={{
-                        total: this.state.total,
-                        current: this.state.page,
-                        showQuickJumper: true,
-                        showSizeChanger: true,
-                        showTotal: (total) => `共 ${total} 条`,
-                        onChange: changePage
-                    }}
-                />
+                        <Form.Item>
+                            <Button type="default" onClick={this.handleBatchDeleteQuestions} danger>删除</Button>
+                        </Form.Item>
+                        <Form.Item>
+                            <Button type="primary" onClick={() => {
+                                this.props.history.push('/questionAdd');
+                            }}>新增试题</Button>
+                        </Form.Item>
+                    </Form>
+                    <Table
+                        dataSource={list}
+                        columns={columns}
+                        rowKey="id"
+                        bordered={true}
+                        size={'small'}
+                        scroll={{ y: 500 }}
+                        loading={loading}
+                        rowSelection={{
+                            selectedRowKeys: selectedRowKeys,
+                            onChange: this.handleOnChange,
+                            getCheckboxProps: () => ({
+                                disabled: false
+                            })
+                        }}
+                        pagination={{
+                            total: this.state.total,
+                            current: this.state.page,
+                            showQuickJumper: true,
+                            showSizeChanger: true,
+                            showTotal: (total) => `共 ${total} 条`,
+                            onChange: changePage
+                        }}
+                    />
+                </div>
             </div>
         );
     }
diff --git a/packages/examination/src/views/statistical/serviceStatistics.tsx b/packages/examination/src/views/statistical/serviceStatistics.tsx
index 67f57d0..ec3c908 100644
--- a/packages/examination/src/views/statistical/serviceStatistics.tsx
+++ b/packages/examination/src/views/statistical/serviceStatistics.tsx
@@ -75,14 +75,14 @@ const App: React.FC = () => {
             key: 'serviceStatusName',
         },
         {
-            title: '启保时间',
+            title: '起保日期',
             dataIndex: 'startDate',
             align: 'center',
             width: 150,
             key: 'startDate',
         },
         {
-            title: '终保时间',
+            title: '终保日期',
             dataIndex: 'doneDate',
             align: 'center',
             width: 150,