Merge remote-tracking branch 'origin/main'

packages/examination/src/style/common.css

@@ -382,3 +382,7 @@ table.ikd-input-table {
   height: 100%;
   font-size: x-large;
 }
+.ant-btn-dangerous {
+  color: #ff4d4f !important;
+  border-color: #ff4d4f !important;
+}

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

@@ -472,7 +472,10 @@ const ExamListPage = ({ history }: { history: any }) => {
     }
 
     return (
-        <div className="list-filter">
+        <div className="container">
+            <div>
+                <div className="header-filter">
+                    <div className="list-filter" style={{display: 'flex', padding: 15}}>
                         <Form
                             //ref={this.formRef}
                             className="filter"
@@ -541,6 +544,8 @@ const ExamListPage = ({ history }: { history: any }) => {
                                 </Button>
                             </Form.Item>
                         </Form>
+                    </div>
+                </div>
                 <div style={{marginBottom: 16, textAlign: "right"}}>
                     <Button onClick={handleDeleteSelected} danger>
                         删除
@@ -586,6 +591,7 @@ const ExamListPage = ({ history }: { history: any }) => {
                     </div>
                 </Modal>
             </div>
+        </div>
     );
 };
 

packages/examination/src/views/examPaper/examPaperList.tsx

@@ -349,7 +349,10 @@ class ExamPaperList extends Component<any, States> {
         ];
 
         return (
-            <div className="list-filter">
+            <div className="container">
+                <div>
+                    <div className="header-filter">
+                        <div className="list-filter" style={{display: 'flex', padding: 15}}>
                             <Form
                                 ref={this.formRef}
                                 className="filter"
@@ -396,13 +399,15 @@ class ExamPaperList extends Component<any, States> {
                                 }}>查询</Button>
                             </Form.Item>
                         </Form>
+                        </div>
+                    </div>
                     <Form
                         className="filter"
                         layout="inline"
                         style={{ justifyContent: 'flex-end' }}
                     >
                         <Form.Item>
-                        <Button type="default" onClick={this.handleBatchDeleteExamPaper}>删除</Button>
+                            <Button type="default" onClick={this.handleBatchDeleteExamPaper} danger>删除</Button>
                         </Form.Item>
                         <Form.Item>
                             <Button type="default" onClick={() => this.handleBatchUpdatePaperStatus(1)}>停用</Button>
@@ -439,6 +444,7 @@ class ExamPaperList extends Component<any, States> {
                         }}
                     />
                 </div>
+            </div>
         );
     }
 }

packages/examination/src/views/question/questionList.tsx

@@ -281,7 +281,10 @@ class QuestionList extends Component<any, States> {
         ];
 
         return (
-            <div className="list-filter">
+            <div className="container">
+                <div>
+                    <div className="header-filter">
+                        <div className="list-filter" style={{display: 'flex', padding: 15}}>
                             <Form
                                 ref={this.formRef}
                                 className="filter"
@@ -357,13 +360,15 @@ class QuestionList extends Component<any, States> {
                                     }}>查询</Button>
                                 </Form.Item>
                             </Form>
+                        </div>
+                    </div>
                     <Form
                         className="filter"
                         layout="inline"
                         style={{ justifyContent: 'flex-end' }}
                     >
                         <Form.Item>
-                        <Button type="default" onClick={this.handleBatchDeleteQuestions}>删除</Button>
+                            <Button type="default" onClick={this.handleBatchDeleteQuestions} danger>删除</Button>
                         </Form.Item>
                         <Form.Item>
                             <Button type="primary" onClick={() => {
@@ -396,6 +401,7 @@ class QuestionList extends Component<any, States> {
                         }}
                     />
                 </div>
+            </div>
         );
     }
 }

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,