From bd1f3f71fc37d966709ebe2839ca12f1088dbb57 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Thu, 10 Mar 2022 15:22:45 +0800
Subject: [PATCH] fix

---
 .../examinationrules/normal/step/index.tsx    | 31 +++++-----------
 admin/src/pages/examinationrules/service.ts   | 37 +++++++++++++------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx
index 60b2460..16f1487 100644
--- a/admin/src/pages/examinationrules/normal/step/index.tsx
+++ b/admin/src/pages/examinationrules/normal/step/index.tsx
@@ -354,19 +354,15 @@ export default () => {
                             
                             <Typography style={{ padding: 24, fontSize: 24, textAlign: 'center' }}>{rulesName}</Typography>
                             {/** 一旦录入另一项将禁用，清空组卷后可选另一项 */}
-                            <Radio.Group size='large' value={createType} onChange={(e) => {
-                                setCreateType(Number(e?.target?.value))
-                                console.log('value', e?.target?.value)
-                                //handleAutoModalVisible(true); // 显示系统组卷窗口
-                            }} style={{ marginBottom: 16, }}>
-                                <Radio.Button value={1} style={{ width: 200, textAlign: 'center' }}>手动组卷</Radio.Button>
-                                <Radio.Button value={2} style={{ width: 200, textAlign: 'center' }}>系统组卷</Radio.Button>
-                            </Radio.Group>
+                            <Row>
+                                <Col span={12} style={{padding:5}}><Button size="large" onClick={()=>{handleSelectorModalVisible(true)}} value={1} style={{ display:'block', textAlign: 'center', width:'100%'}}>手动组卷</Button></Col>
+                                <Col span={12} style={{padding:5}}><Button size="large" onClick={()=>{handleAutoModalVisible(true)}} value={2} style={{ display:'block', textAlign: 'center', width:'100%'}}>系统组卷</Button></Col>
+                            </Row>
                             <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
 
                             <Row>
                                 <Col span={18} style={{ background: '#ffffff', padding: 0 }}>
-                                    <Empty style={{minHeight:360,padding:60,verticalAlign:'middle'}} />
+                                {questions &&
                                     <ProCard
                                         title=""
                                         extra={false}
@@ -422,6 +418,10 @@ export default () => {
 
                                         </Space>
                                     </ProCard>
+                                }
+                                {!questions &&
+                                    <Empty style={{minHeight:360, padding:60, verticalAlign:'middle',color:'#cccccc'}} description='暂无试卷' />
+                                }
                                 </Col>
                                 <Col span={6} style={{ paddingLeft: 24 }}>
                                     <div style={{ background: '#ffffff', padding: 24 }}>
@@ -436,19 +436,6 @@ export default () => {
                                                 )}
                                             </Space>
                                             <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
-
-                                            <Button size="large" block onClick={() => {
-                                                console.log('createType', createType)
-                                                if (createType === 1) {
-                                                    console.log('11:', createType)
-                                                    handleSelectorModalVisible(true)
-                                                } else {
-                                                    console.log('22:', createType)
-                                                    handleAutoModalVisible(true); // 显示系统组卷窗口(true)
-                                                }
-
-                                            }}>选择试题</Button>
-
                                             <Button size="large" block onClick={() => {
                                                 /** 
                                                  * 设置分值前需要题型数据
diff --git a/admin/src/pages/examinationrules/service.ts b/admin/src/pages/examinationrules/service.ts
index 1675870..55fc54c 100644
--- a/admin/src/pages/examinationrules/service.ts
+++ b/admin/src/pages/examinationrules/service.ts
@@ -71,18 +71,6 @@ export async function querySubjectList(params: {
   });
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 /** 删除考试 POST /dsideal_yy/ypt/careerTraining/course/delete */
 export async function removeExamination(data: { key: number[] }, options?: Record<string, any>) {
   return request<Record<string, any>>('/dsideal_yy/ypt/careerTraining/course/delete', {
@@ -257,3 +245,28 @@ export async function exchangeSortNum(data: Record<string, any>, options?: Recor
     ...(options || {}),
   });
 }
+
+/** 16 组卷，查询试题数据（去掉已选列表）*/
+export async function queryQuestionWithoutList(
+  params: {
+    // query
+    /** 当前的页码 */
+    current?: number;
+    /** 页面的容量 */
+    pageSize?: number;
+  },
+  options?: Record<string, any>,
+) {
+  return request<{
+    data: TableListItem[];
+    /** 列表的内容总数 */
+    total?: number;
+    success?: boolean;
+  }>('/dsideal_yy/zygh/training/rules/getQuestionList', {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
\ No newline at end of file