From a54e22610d7634d1b6c7e5ef4b83ccb3b7a6f56e Mon Sep 17 00:00:00 2001
From: "YOHO\\20373" <2037305722@qq.com>
Date: Mon, 9 Jun 2025 10:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=87=BA?=
 =?UTF-8?q?=E9=A2=98=E7=9F=A5=E8=AF=86=E7=82=B9=E5=8F=AF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=97=B6=E6=95=88=E6=80=A7,MYSQL?=
 =?UTF-8?q?=E5=88=A4=E5=88=86=E8=AF=AD=E5=8F=A5=E5=A2=9E=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=9D=83=E5=80=BC=20=E3=80=90=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E3=80=91=E8=AF=95=E5=8D=B7=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=B7=B2=E6=9C=89=E7=9A=84=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E6=8A=BD=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/paper/index.ts                 |   4 +-
 src/api/system/task/index.ts                  |  12 +-
 src/views/exam/points/index.vue               |   3 -
 src/views/paper/question/BrowerForm.vue       | 239 ++++++---
 src/views/paper/question/FileForm.vue         | 301 ++++++++---
 src/views/paper/question/MysqlForm.vue        | 240 +++++----
 src/views/paper/question/index.vue            |  98 +++-
 .../steps/step1/components/step-edit.vue      |   8 +-
 .../steps/step2/components/step-add.vue       | 489 ++++++++++++++----
 .../steps/step2/components/step-edit.vue      |  20 +-
 .../exam/components/steps/step2/index.vue     |  15 +-
 .../exam/components/steps/step3/index.vue     | 175 ++++---
 .../steps/step5/components/person-edit.vue    |   2 +-
 .../exam/components/steps/step5/index.vue     |  10 +-
 .../steps/step1/components/step-edit.vue      |   8 +-
 .../steps/step2/components/step-add.vue       | 478 +++++++++++++----
 .../components/steps/step2/index copy.vue     | 211 --------
 .../components/steps/step2/index.vue          |   2 +-
 .../components/steps/step3/index.vue          | 174 ++++---
 .../steps/step5/components/person-edit.vue    |   2 +-
 .../components/steps/step5/index.vue          |  10 +-
 .../steps/step1/components/step-edit.vue      |   8 +-
 .../steps/step2/components/step-add.vue       | 478 +++++++++++++----
 .../components/steps/step2/index copy.vue     | 211 --------
 .../module/components/steps/step2/index.vue   |   2 +-
 .../module/components/steps/step3/index.vue   | 404 +++++++--------
 .../steps/step5/components/person-edit.vue    |   3 +-
 .../module/components/steps/step5/index.vue   |  10 +-
 .../steps/step1/components/step-edit.vue      |   8 +-
 .../steps/step2/components/step-add.vue       | 478 +++++++++++++----
 .../components/steps/step2/index copy.vue     | 211 --------
 .../random/components/steps/step2/index.vue   |  12 +-
 .../random/components/steps/step3/index.vue   | 174 ++++---
 .../steps/step5/components/person-edit.vue    |   2 +-
 .../random/components/steps/step5/index.vue   |  10 +-
 .../steps/step1/components/step-edit.vue      |  10 +-
 .../steps/step2/components/step-add.vue       | 489 ++++++++++++++----
 .../steps/step2/components/step-edit.vue      |  18 +-
 .../sprint/components/steps/step2/index.vue   |  15 +-
 .../sprint/components/steps/step3/index.vue   | 175 ++++---
 .../steps/step5/components/person-edit.vue    |   2 +-
 .../sprint/components/steps/step5/index.vue   |  13 +-
 .../steps/step1/components/step-edit.vue      |   8 +-
 .../steps/step2/components/step-add.vue       | 489 ++++++++++++++----
 .../steps/step2/components/step-edit.vue      |  20 +-
 .../trans/components/steps/step2/index.vue    |  15 +-
 .../trans/components/steps/step3/index.vue    | 135 ++---
 .../steps/step5/components/person-edit.vue    |   2 +-
 .../trans/components/steps/step5/index.vue    |  10 +-
 49 files changed, 3727 insertions(+), 2186 deletions(-)
 delete mode 100644 src/views/task/selftrans/collegeexam/components/steps/step2/index copy.vue
 delete mode 100644 src/views/task/selftrans/module/components/steps/step2/index copy.vue
 delete mode 100644 src/views/task/selftrans/random/components/steps/step2/index copy.vue

diff --git a/src/api/system/paper/index.ts b/src/api/system/paper/index.ts
index 48b7d9b..7b8ad0c 100644
--- a/src/api/system/paper/index.ts
+++ b/src/api/system/paper/index.ts
@@ -29,7 +29,9 @@ export async function getPaper(id) {
 export async function addPaper(params) {
   return await request.get({ url: '/exam/paper/add' , params  })
 }
-
+export async function addPaperBypaper(data) {
+  return await request.post({ url: '/exam/paper/addPaperBypaper' , data  })
+}
 /**
  * 修改试卷
  */
diff --git a/src/api/system/task/index.ts b/src/api/system/task/index.ts
index a0e29ad..0c2abe5 100644
--- a/src/api/system/task/index.ts
+++ b/src/api/system/task/index.ts
@@ -5,10 +5,18 @@ import request from '@/config/axios'
  */
 export async function pageTasks(params) {
     return await request.get({ url: '/exam/task/list' , params })
-
-
 }
 
+export async function pageTaskPapers(params) {
+    return await request.get({ url: '/exam/task/listPaper' , params })
+}
+
+
+export async function checkType(data) {
+
+  return await request.post({ url: '/exam/task/checkType' , data  })
+
+}
 /**
  * 查询全部试卷任务
  */
diff --git a/src/views/exam/points/index.vue b/src/views/exam/points/index.vue
index 6b35c1d..db6fb12 100644
--- a/src/views/exam/points/index.vue
+++ b/src/views/exam/points/index.vue
@@ -68,7 +68,6 @@
             link
             type="primary"
             @click="openForm('create', scope.row.id)"
-            v-hasPermi="['system:dept:update']"
           >
             新增
         </el-button>
@@ -76,7 +75,6 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:dept:update']"
           >
             修改
           </el-button>
@@ -84,7 +82,6 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:dept:delete']"
           >
             删除
           </el-button>
diff --git a/src/views/paper/question/BrowerForm.vue b/src/views/paper/question/BrowerForm.vue
index 8aef3e0..93b87d2 100644
--- a/src/views/paper/question/BrowerForm.vue
+++ b/src/views/paper/question/BrowerForm.vue
@@ -1,6 +1,19 @@
 <template>
   <div class="edit-dialog">
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="85%"  top="10vh"   class="custom-dialog">
+
+      <el-dialog v-model="dialogVisiblePoints" title="选择知识点" width="30%">
+        <el-tree
+          ref="treeRef"
+          :data="deptList"
+          node-key="id"
+          :props="{ label: 'name', children: 'children' }"
+          highlight-current
+          default-expand-all
+          @node-click="handleNodeClick"
+        />
+      </el-dialog>
+
       <el-scrollbar>
         <div class="main">
           <el-form
@@ -16,11 +29,14 @@
                   <el-input v-model="formData.specialtyName" placeholder="请输入专业" disabled/>
                 </el-form-item>
               </el-col>
-                    <el-col :span="12">
-                <el-form-item label="知识点" prop="pointNames">
-                  <el-input v-model="formData.pointNames" placeholder="请输入知识点" disabled/>
+
+              <el-col :span="12">
+                <el-form-item label="章节名称" prop="chapteridDictText">
+                  <el-input v-model="formData.chapteridDictTextVo" placeholder="请输入章节名称"  disabled />
                 </el-form-item>
               </el-col>
+
+
             </el-row>
             <el-row>
               <el-col :span="12">
@@ -29,22 +45,21 @@
                 </el-form-item>
               </el-col>
                 <el-col :span="12">
-                <!-- <el-form-item label="题型难度" prop="quLevel">
-                  <el-input v-model="formData.quLevel" placeholder="请输入题型难度" />
-                </el-form-item> -->
-
-          <el-form-item label="题型难度" prop="quLevel">
-            <el-select
-              v-model="formData.quLevel"
-              placeholder="请选择题型难度"
-              clearable
-            >
-              <el-option label="简单" :value="'0'" />
-              <el-option label="一般" :value="'1'" />
-              <el-option label="困难" :value="'2'" />
-            </el-select>
-          </el-form-item>
 
+            <el-form-item label="题型难度" prop="quLevel">
+              <el-select
+                v-model="formData.quLevel"
+                placeholder="请选择题型难度"
+                clearable
+              >
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.EXAM_QUE_DIFF)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
 
               </el-col>
             </el-row>
@@ -57,11 +72,18 @@
                 </el-form-item>
               </el-col>
 
+     
               <el-col :span="12">
-                <el-form-item label="章节名称" prop="chapteridDictText">
-                  <el-input v-model="formData.chapteridDictText" placeholder="请输入章节名称"  disabled />
+                <el-form-item label="知识点" prop="pointNames">
+                  <el-input
+                    v-model="formData.pointNamesVo"
+                    placeholder="请选择知识点"
+                    readonly
+                    @click="openPoints()"
+                  />
                 </el-form-item>
               </el-col>
+
             </el-row>
 
             <el-row>
@@ -147,50 +169,6 @@
                     </el-dialog>
                   </div>
                 </el-tab-pane>
-                <!-- <el-tab-pane name="medium">
-                  <template #label>
-                    <div class="custom-tabs-label">
-                      <p>媒体文件</p>
-                      <el-dropdown>
-                        <span class="el-dropdown-link" @click.stop="false">
-                          <div class="setting_icon"></div>
-                        </span>
-                        <template #dropdown>
-                          <el-dropdown-menu>
-                            <el-dropdown-item>
-                              <el-upload
-                                v-model:file-list="fileList"
-                                class="upload-demo"
-                                action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-                              >
-                                <el-button>导入</el-button>
-                              </el-upload>
-                            </el-dropdown-item>
-                            <el-dropdown-item>导出</el-dropdown-item>
-                            <el-dropdown-item>播放</el-dropdown-item>
-                            <el-dropdown-item>编辑</el-dropdown-item>
-                            <el-dropdown-item>删除选中</el-dropdown-item>
-                          </el-dropdown-menu>
-                        </template>
-                      </el-dropdown>
-                    </div>
-                  </template>
-                  <div class="block">
-                    <el-table
-                      :data="mediumList"
-                      style="width: 100%"
-                      @selection-change="handleMediumSelectionChange"
-                    >
-                      <el-table-column type="index" width="50" />
-                      <el-table-column type="selection" width="55" />
-                      <el-table-column prop="type" label="媒体类型" width="80" />
-                      <el-table-column prop="title" label="标题" />
-                      <el-table-column prop="displayIndex" label="显示序号" />
-                      <el-table-column prop="size" label="大小" />
-                    </el-table>
-                  </div>
-                </el-tab-pane> -->
-               
                   <el-tab-pane v-if="formType === 'update'" name="point">
 
                     <template #label>
@@ -203,7 +181,6 @@
                         <template #dropdown>
                           <el-dropdown-menu>
                             <el-dropdown-item @click="setKao()">考点设置</el-dropdown-item>
-                          
                           </el-dropdown-menu>
                         </template>
                       </el-dropdown>
@@ -229,11 +206,12 @@
                             width="60%"
                             :close-on-click-modal="false"
                             class="custom-dialog"
+                             draggable
                           >
                             <!-- 可滚动容器 -->
                             <div style="height: 400px; overflow-y: auto;">
                               <el-table
-                                  :data="kaodianList"
+                                  :data="kaodiaRefList"
                                   style="width: 100%;"
                                   row-key="answerId"
                                   :default-expand-all="false"
@@ -258,6 +236,7 @@
                                     v-model="scope.row.scoreRate"
                                     size="small"
                                     type="number"
+                                    min="0"
                                   />
                                 </template>
                                </el-table-column>
@@ -302,12 +281,11 @@
                             <template #footer>
                         
                            
-                              <el-button @click="kaoDialogVisible = false">取消</el-button>
+                              <el-button @click="confimKaoFalse">取消</el-button>
                               <el-button type="primary" @click="confirmKao">确定</el-button>
                             </template>
                           </el-dialog>
 
-
                   
 
                   </el-tab-pane>
@@ -426,6 +404,8 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { FormRules } from 'element-plus'
 import * as QuestionApi from '@/api/paper/question'
 import FileForm from './components/FileForm.vue';
+import * as SpecialtyApi from '@/api/points'
+import { defaultProps, handleTree } from '@/utils/tree'
 defineOptions({ name: 'ChoiceForm' })
 
 const { t } = useI18n() // 国际化
@@ -438,6 +418,8 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
+  pointNamesVo:'',
+  chapteridDictTextVo:'',
   content: '',
   specialtyName: '',
   courseName: '',
@@ -445,7 +427,7 @@ const formData = ref({
   required: '',
   chapteridDictText: '',
   analysis: '',
-  quLevel: '',
+  quLevel: 0,
   pointNames: '',
   subjectName: '',
   status: ' ',
@@ -455,10 +437,11 @@ const formData = ref({
       quId: '',
       url: '',
       fileType: '1',
-      fileName: ''
+      fileName: '原始'
     }]
 })
 const kaodianList = ref<any[]>([]) 
+const kaodiaRefList = ref<any[]>([]) 
 function fileTypeFormatter(row, column, cellValue) {
   if (cellValue === '1') return '考试文件'
   return '未知类型'
@@ -471,13 +454,36 @@ const kaodianData = ref({
   quId: '', // 你打开编辑弹窗时会赋值
 })
 function setKao() {
+kaodiaRefList.value = JSON.parse(JSON.stringify(kaodianList.value))
   kaoDialogVisible.value = true
 }
 
-function confirmKao() {
+async function confirmKao() {
+  const contentSet = new Set<string>();
+
+  for (const [index, item] of kaodiaRefList.value.entries()) {
+    if (!item.content || item.content.trim() === '') {
+      ElMessage.warning(`第 ${index + 1} 行「文件名」不能为空`)
+      return
+    }
+    if (contentSet.has(item.content.trim())) {
+      ElMessage.warning(`第 ${index + 1} 行「文件名」不能重复`)
+      return
+    }
+    contentSet.add(item.content.trim())
+
+    if (item.scoreRate === null || item.scoreRate === '' || item.scoreRate < 0) {
+      ElMessage.warning(`第 ${index + 1} 行「权值」不能为空且不能小于 0`)
+      return
+    }
+    if (!item.contentIn || item.contentIn.trim() === '') {
+      ElMessage.warning(`第 ${index + 1} 行「考察类型」不能为空`)
+      return
+    }
+  }
 
   // 构建 questionAnswerList
-  const questionAnswerList = kaodianList.value.map(item => ({
+  const questionAnswerList = kaodiaRefList.value.map(item => ({
     answerId: item.answerId,
     content: item.content,
     quId:kaodianData.value.quId,
@@ -492,18 +498,31 @@ function confirmKao() {
 
   console.log('确认后的结果:', payload)
 
-  QuestionApi.setBrowserPoint(payload)
+  await  QuestionApi.setBrowserPoint(payload)
+
+  const res = await QuestionApi.getListByQuId(kaodianData.value.quId);
+  kaodianList.value = res;
+    kaoDialogVisible.value= false;
+}
+
+
+
+function confimKaoFalse() {
+
   kaoDialogVisible.value= false;
 }
 
+
 // 删除行
 function removeKaodian(index: number) {
-  kaodianList.value.splice(index, 1)
+
+  kaodiaRefList.value.splice(index, 1)
 }
 
 // 增加行
 function addKaodianRow() {
-  kaodianList.value.push({
+ 
+  kaodiaRefList.value.push({
     answerId: '', // 用你项目里生成 ID 的方法
     content: '',
     quId:kaodianData.value.quId,
@@ -728,10 +747,10 @@ keywordList.value = res.keywords
     formData.value.specialtyName = queryParams.specialtyName
     formData.value.courseName = queryParams.courseName
     formData.value.subjectName = queryParams.subjectName
-    formData.value.pointNames=queryParams.pointNames
-    formData.value.chapteridDictText=queryParams.chapteridDictText
-
-    
+    formData.value.pointNames=queryParams.pointNamesVo
+    formData.value.pointNamesVo=queryParams.pointNames
+    formData.value.chapteridDictText=queryParams.chapteridDictTextVo
+    formData.value.chapteridDictTextVo=queryParams.chapteridDictText
   }
      
 }
@@ -792,7 +811,7 @@ const resetForm = () => {
     required: '',
     chapteridDictText: '',
     analysis: '',
-    quLevel: '0',
+    quLevel: 0,
     pointNames: '',
     subjectName: '',
     status: '0',
@@ -803,13 +822,71 @@ const resetForm = () => {
       quId: '',
       url: '',
       fileType: '1',
-      fileName: ''
+      fileName: '原始'
     }]
   }
   keywordList.value=[],
   formRef.value?.resetFields()
 
 }
+
+
+const selectedPointName = ref('')
+const selectedchapterText = ref('')
+const dialogVisiblePoints = ref(false)
+
+// 添加层级信息
+const handleTreeWithLevel = (list, level = 1) => {
+  return list.map(item => {
+    const node = { ...item, level }
+    if (item.children && item.children.length > 0) {
+      node.children = handleTreeWithLevel(item.children, level + 1)
+    }
+    return node
+  })
+}
+
+// 只允许点击第三级节点
+const treeRef = ref() // 引用 el-tree
+const handleNodeClick = (data, node) => {
+  if (data.level === 3) {
+    formData.value.pointNames = data.id
+    formData.value.pointNamesVo = data.name
+
+    //  获取父节点（章节名称）
+    const currentNode = treeRef.value.getNode(data)
+    const parentNode = currentNode.parent
+    if (parentNode && parentNode.data) {
+      formData.value.chapteridDictTextVo = parentNode.data.name
+      formData.value.chapteridDictText = parentNode.data.id
+    } else {
+      formData.value.chapteridDictText = ''
+    }
+
+    dialogVisiblePoints.value = false
+  } else {
+  }
+}
+
+
+
+const deptList = ref<Tree[]>([]) // 树形结构
+/** 获得部门树 */
+const getTree = async () => {
+  const res = await SpecialtyApi.listPoints()
+ const tree = handleTree(res)   
+   deptList.value = []                 
+  deptList.value = handleTreeWithLevel(tree) 
+  
+
+}
+const openPoints = async () => {
+  await getTree();
+    dialogVisiblePoints.value = true;
+}
+
+
+
 </script>
 <style lang="scss" scoped>
 .edit-dialog {
diff --git a/src/views/paper/question/FileForm.vue b/src/views/paper/question/FileForm.vue
index 6a88d71..e8d5357 100644
--- a/src/views/paper/question/FileForm.vue
+++ b/src/views/paper/question/FileForm.vue
@@ -1,6 +1,18 @@
 <template>
   <div class="edit-dialog">
     <Dialog v-model="dialogVisible" :title="dialogTitle" width="85%"  top="10vh"   class="custom-dialog">
+      
+      <el-dialog v-model="dialogVisiblePoints" title="选择知识点" width="30%">
+        <el-tree
+          ref="treeRef"
+          :data="deptList"
+          node-key="id"
+          :props="{ label: 'name', children: 'children' }"
+          highlight-current
+          default-expand-all
+          @node-click="handleNodeClick"
+        />
+      </el-dialog>
       <el-scrollbar>
         <div class="main">
           <el-form
@@ -16,11 +28,13 @@
                   <el-input v-model="formData.specialtyName" placeholder="请输入专业" disabled/>
                 </el-form-item>
               </el-col>
-                    <el-col :span="12">
-                <el-form-item label="知识点" prop="pointNames">
-                  <el-input v-model="formData.pointNames" placeholder="请输入知识点" disabled/>
+
+                 <el-col :span="12">
+                <el-form-item label="章节名称" prop="chapteridDictText">
+                  <el-input v-model="formData.chapteridDictTextVo" placeholder="请输入章节名称"  disabled />
                 </el-form-item>
               </el-col>
+
             </el-row>
             <el-row>
               <el-col :span="12">
@@ -29,21 +43,22 @@
                 </el-form-item>
               </el-col>
                 <el-col :span="12">
-                <!-- <el-form-item label="题型难度" prop="quLevel">
-                  <el-input v-model="formData.quLevel" placeholder="请输入题型难度" />
-                </el-form-item> -->
 
-          <el-form-item label="题型难度" prop="quLevel">
-            <el-select
-              v-model="formData.quLevel"
-              placeholder="请选择题型难度"
-              clearable
-            >
-              <el-option label="简单" :value="'0'" />
-              <el-option label="一般" :value="'1'" />
-              <el-option label="困难" :value="'2'" />
-            </el-select>
-          </el-form-item>
+
+            <el-form-item label="题型难度" prop="quLevel">
+              <el-select
+                v-model="formData.quLevel"
+                placeholder="请选择题型难度"
+                clearable
+              >
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.EXAM_QUE_DIFF)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
 
 
               </el-col>
@@ -58,10 +73,17 @@
               </el-col>
 
               <el-col :span="12">
-                <el-form-item label="章节名称" prop="chapteridDictText">
-                  <el-input v-model="formData.chapteridDictText" placeholder="请输入章节名称"  disabled />
+                <el-form-item label="知识点" prop="pointNames">
+                  <el-input
+                    v-model="formData.pointNamesVo"
+                    placeholder="请选择知识点"
+                    readonly
+                    @click="openPoints()"
+                  />
                 </el-form-item>
               </el-col>
+
+
             </el-row>
 
             <el-row>
@@ -234,18 +256,16 @@
                             width="60%"
                             :close-on-click-modal="false"
                             class="custom-dialog"
+                            draggable
                           >
                             <!-- 可滚动容器 -->
                             <div style="height: 400px; overflow-y: auto;">
                               <el-table
-                                  :data="kaodianList"
+                                  :data="kaodiaRefList"
                                   style="width: 100%;"
                                   row-key="answerId"
                                   :default-expand-all="false"
-                                 
-
                                 >
-
                                 <el-table-column type="index" label="序号" width="60" />
 
                                 <el-table-column label="文件/文件夹名(带后缀)" width="260">
@@ -254,6 +274,8 @@
                                     v-model="scope.row.content"
                                     size="small"
                                     type="input"
+                                          
+                                  @click="openFileTree(scope.row)"
                                   />
                                 </template>
                                </el-table-column>
@@ -263,6 +285,7 @@
                                     v-model="scope.row.scoreRate"
                                     size="small"
                                     type="number"
+                                    min="0"
                                   />
                                 </template>
                                </el-table-column>
@@ -322,20 +345,6 @@
                   <template #label>
                     <div class="custom-tabs-label">
                       <p>试题附件</p>
-                      <!-- <el-dropdown>
-                        <span class="el-dropdown-link" @click.stop="false">
-                          <div class="setting_icon"></div>
-                        </span>
-                        <template #dropdown>
-                          <el-dropdown-menu>
-                            <el-dropdown-item>导入单文件</el-dropdown-item>
-                            <el-dropdown-item>导入多文件</el-dropdown-item>
-                            <el-dropdown-item>导出</el-dropdown-item>
-                            <el-dropdown-item>删除</el-dropdown-item>
-                            <el-dropdown-item>帮助</el-dropdown-item>
-                          </el-dropdown-menu>
-                        </template>
-                      </el-dropdown> -->
                     </div>
                   </template>
                   <!-- 提示 -->
@@ -418,6 +427,22 @@
   </div>
     <!-- 表单弹窗：添加/修改 -->
   <FileForm ref="FileRef" @success="handleUploadSuccess"/>
+<el-dialog
+  v-model="fileTreeDialogVisible"
+  title="选择文件"
+  width="40%"
+  :close-on-click-modal="false"
+  draggable
+>
+  <el-tree
+    :data="fileTreeData"
+    node-key="id"
+    :props="{ label: 'name', children: 'children' }"
+    @node-click="handleFileNodeClick"
+    default-expand-all
+  />
+</el-dialog>
+
 
 
 </template>
@@ -426,8 +451,11 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { FormRules } from 'element-plus'
 import * as QuestionApi from '@/api/paper/question'
 import FileForm from './components/FileForm.vue';
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as SpecialtyApi from '@/api/points'
 defineOptions({ name: 'ChoiceForm' })
-
+// 定义一个缓存对象
+const nodeListCache: Record<number, any> = {}; 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -435,7 +463,16 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+const fileTreeDialogVisible = ref(false);
+const fileTreeData = ref<Tree[]>([]);
+const currentEditingRow = ref<any>(null); // 当前点击的行
+
+
+
 const formData = ref({
+  pointNamesVo:'',
+  chapteridDictTextVo:'',
   content: '<p>---------------------------------------------------------------------</p><p> 请在打开的窗口中，进行下列操作，完成所有操作后，请关闭窗口。</p><p>---------------------------------------------------------------------</p><p>',
   specialtyName: '',
   courseName: '',
@@ -443,7 +480,7 @@ const formData = ref({
   required: '',
   chapteridDictText: '',
   analysis: '',
-  quLevel: '',
+  quLevel: 0,
   pointNames: '',
   subjectName: '',
   status: ' ',
@@ -453,13 +490,13 @@ const formData = ref({
       quId: '',
       url: '',
       fileType: '1',
-      fileName: ''
+      fileName: '原始'
     },
     {
       quId: '',
       url: '',
       fileType: '2',
-      fileName: ''
+      fileName: '结果'
     }]
 })
 
@@ -471,18 +508,94 @@ function fileTypeFormatter(row, column, cellValue) {
 
 
 //考点
+
+
+
+const openFileTree = (row: any) => {
+
+  console.log("111")
+  const quId = kaodianData.value.quId;
+  const cached = nodeListCache[quId];
+  if (!cached) {
+    ElMessage.warning('暂无缓存的文件结构');
+    return;
+  }
+
+    fileTreeData.value.push(...handleTree(cached))
+  currentEditingRow.value = row;
+  fileTreeDialogVisible.value = true;
+};
+
+const handleFileNodeClick = (data) => {
+  const pathArray = findFilePathById(fileTreeData.value, data.id)
+  if (!pathArray) return
+
+  const fullPath = pathArray.join('\\')
+  if (currentEditingRow.value) {
+    currentEditingRow.value.content = fullPath
+  }
+  fileTreeDialogVisible.value = false
+}
+const findFilePathById = (
+  tree: any[],
+  targetId: number,
+  path: string[] = []
+): string[] | null => {
+  for (const node of tree) {
+    const currentPath = [...path, node.name]
+    if (node.id === targetId) {
+      return currentPath
+    }
+    if (node.children && node.children.length > 0) {
+      const result = findFilePathById(node.children, targetId, currentPath)
+      if (result) return result
+    }
+  }
+  return null
+}
+
+
 const kaoDialogVisible = ref(false) 
 const kaodianData = ref({
   quId: '', // 你打开编辑弹窗时会赋值
 })
+
+const kaodianList = ref<any[]>([]) 
+const kaodiaRefList = ref<any[]>([]) 
+
+
 function setKao() {
+  kaodiaRefList.value = JSON.parse(JSON.stringify(kaodianList.value))
   kaoDialogVisible.value = true
 }
-const kaodianList = ref<any[]>([]) 
-function confirmKao() {
+async function confirmKao() {
+
+  const contentSet = new Set<string>();
+
+  for (const [index, item] of kaodiaRefList.value.entries()) {
+    if (!item.content || item.content.trim() === '') {
+      ElMessage.warning(`第 ${index + 1} 行「文件名」不能为空`)
+      return
+    }
+    if (contentSet.has(item.content.trim())) {
+      ElMessage.warning(`第 ${index + 1} 行「文件名」不能重复`)
+      return
+    }
+    contentSet.add(item.content.trim())
+
+    if (item.scoreRate === null || item.scoreRate === '' || item.scoreRate < 0) {
+      ElMessage.warning(`第 ${index + 1} 行「权值」不能为空且不能小于 0`)
+      return
+    }
+    if (!item.contentIn || item.contentIn.trim() === '') {
+      ElMessage.warning(`第 ${index + 1} 行「考察类型」不能为空`)
+      return
+    }
+  }
+ 
 
   // 构建 questionAnswerList
-  const questionAnswerList = kaodianList.value.map(item => ({
+  const questionAnswerList = kaodiaRefList.value.map(item => ({
     answerId: item.answerId,
     content: item.content,
     quId:kaodianData.value.quId,
@@ -497,13 +610,17 @@ function confirmKao() {
 
   console.log('确认后的结果:', payload)
 
-  QuestionApi.setBrowserPoint(payload)
+  await QuestionApi.setBrowserPoint(payload)
+
+  const res = await QuestionApi.getListByQuId(kaodianData.value.quId);
+  kaodianList.value = res;
   kaoDialogVisible.value= false;
+
 }
 
 // 增加行
 function addKaodianRow() {
-  kaodianList.value.push({
+  kaodiaRefList.value.push({
     answerId: '', // 用你项目里生成 ID 的方法
     content: '',
     quId:kaodianData.value.quId,
@@ -513,7 +630,7 @@ function addKaodianRow() {
 }
 // 删除行
 function removeKaodian(index: number) {
-  kaodianList.value.splice(index, 1)
+  kaodiaRefList.value.splice(index, 1)
 }
 
 const setKaodianRow =async () => {
@@ -529,15 +646,20 @@ const setKaodianRow =async () => {
 
   console.log('导入考点的文件地址为：', fileUrl1, fileUrl2);
     const params = {
-      answerPath: fileUrl1,
-      shucaiPath: fileUrl2 // 如果不传可以是空字符串，也可以删除这个字段（根据后端是否必填）
+     shucaiPath: fileUrl1,
+     answerPath : fileUrl2 // 如果不传可以是空字符串，也可以删除这个字段（根据后端是否必填）
     };
 
      const res = await QuestionApi.getFilePoint(params);
 
-      kaodianList.value=res;
-  // 示例：调用后端接口进行导入
-  // importKaodianFromFiles(fileUrl1, fileUrl2);
+      kaodiaRefList.value=res.examQuestionAnswerList;
+
+       // 缓存 nodeList，键为当前 quId
+        const quId = kaodianData.value.quId;
+        if (quId) {
+          nodeListCache[quId] = res.nodeList;
+        }
+
 };
 
 
@@ -754,13 +876,17 @@ keywordList.value = res.keywords
     }
   } else {
    resetForm()
+   console.log(queryParams.pointNamesVo+"queryParams")
+   console.log(queryParams.chapteridDictTextVo+"queryParams")
+   console.log(queryParams.pointNames+"queryParams")
+   console.log(queryParams.chapteridDictText+"queryParams")
     formData.value.specialtyName = queryParams.specialtyName
     formData.value.courseName = queryParams.courseName
     formData.value.subjectName = queryParams.subjectName
-    formData.value.pointNames=queryParams.pointNames
-    formData.value.chapteridDictText=queryParams.chapteridDictText
-
-    
+    formData.value.pointNames=queryParams.pointNamesVo
+    formData.value.pointNamesVo=queryParams.pointNames
+    formData.value.chapteridDictText=queryParams.chapteridDictTextVo
+    formData.value.chapteridDictTextVo=queryParams.chapteridDictText
   }
      
 }
@@ -822,7 +948,7 @@ const resetForm = () => {
     required: '',
     chapteridDictText: '',
     analysis: '',
-    quLevel: '0',
+    quLevel: 0,
     pointNames: '',
     subjectName: '',
     status: '0',
@@ -832,19 +958,76 @@ const resetForm = () => {
       quId: '',
       url: '',
       fileType: '1',
-      fileName: ''
+     fileName: '原始'
     },
     {
       quId: '',
       url: '',
       fileType: '2',
-      fileName: ''
+      fileName: '结果'
     }]
   }
   keywordList.value=[],
   formRef.value?.resetFields()
 
 }
+
+
+const selectedPointName = ref('')
+const selectedchapterText = ref('')
+const dialogVisiblePoints = ref(false)
+
+// 添加层级信息
+const handleTreeWithLevel = (list, level = 1) => {
+  return list.map(item => {
+    const node = { ...item, level }
+    if (item.children && item.children.length > 0) {
+      node.children = handleTreeWithLevel(item.children, level + 1)
+    }
+    return node
+  })
+}
+
+// 只允许点击第三级节点
+const treeRef = ref() // 引用 el-tree
+const handleNodeClick = (data, node) => {
+  if (data.level === 3) {
+    formData.value.pointNames = data.id
+    formData.value.pointNamesVo = data.name
+
+    //  获取父节点（章节名称）
+    const currentNode = treeRef.value.getNode(data)
+    const parentNode = currentNode.parent
+    if (parentNode && parentNode.data) {
+      formData.value.chapteridDictTextVo = parentNode.data.name
+      formData.value.chapteridDictText = parentNode.data.id
+    } else {
+      formData.value.chapteridDictText = ''
+    }
+
+    dialogVisiblePoints.value = false
+  } else {
+  }
+}
+
+
+
+const deptList = ref<Tree[]>([]) // 树形结构
+/** 获得部门树 */
+const getTree = async () => {
+  const res = await SpecialtyApi.listPoints()
+ const tree = handleTree(res)   
+   deptList.value = []                 
+  deptList.value = handleTreeWithLevel(tree) 
+  
+
+}
+const openPoints = async () => {
+  await getTree();
+    dialogVisiblePoints.value = true;
+}
+
+
 </script>
 <style lang="scss" scoped>
 .edit-dialog {
diff --git a/src/views/paper/question/MysqlForm.vue b/src/views/paper/question/MysqlForm.vue
index 4a3350e..b2d33eb 100644
--- a/src/views/paper/question/MysqlForm.vue
+++ b/src/views/paper/question/MysqlForm.vue
@@ -16,9 +16,10 @@
                   <el-input v-model="formData.specialtyName" placeholder="请输入专业" disabled/>
                 </el-form-item>
               </el-col>
-                    <el-col :span="12">
-                <el-form-item label="知识点" prop="pointNames">
-                  <el-input v-model="formData.pointNames" placeholder="请输入知识点" disabled/>
+
+              <el-col :span="12">
+                <el-form-item label="章节名称" prop="chapteridDictText">
+                  <el-input v-model="formData.chapteridDictTextVo" placeholder="请输入章节名称"  disabled />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -33,19 +34,20 @@
                   <el-input v-model="formData.quLevel" placeholder="请输入题型难度" />
                 </el-form-item> -->
 
-          <el-form-item label="题型难度" prop="quLevel">
-            <el-select
-              v-model="formData.quLevel"
-              placeholder="请选择题型难度"
-              clearable
-            >
-              <el-option label="简单" :value="'0'" />
-              <el-option label="一般" :value="'1'" />
-              <el-option label="困难" :value="'2'" />
-            </el-select>
-          </el-form-item>
-
-
+              <el-form-item label="题型难度" prop="quLevel">
+                <el-select
+                  v-model="formData.quLevel"
+                  placeholder="请选择题型难度"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in getIntDictOptions(DICT_TYPE.EXAM_QUE_DIFF)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
               </el-col>
             </el-row>
             <el-row>
@@ -58,10 +60,27 @@
               </el-col>
 
               <el-col :span="12">
-                <el-form-item label="章节名称" prop="chapteridDictText">
-                  <el-input v-model="formData.chapteridDictText" placeholder="请输入章节名称"  disabled />
+                <el-form-item label="知识点" prop="pointNames">
+                  <el-input
+                    v-model="formData.pointNamesVo"
+                    placeholder="请选择知识点"
+                    readonly
+                    @click="openPoints()"
+                  />
                 </el-form-item>
               </el-col>
+
+              <el-dialog v-model="dialogVisiblePoints" title="选择知识点" width="30%">
+                <el-tree
+                  ref="treeRef"
+                  :data="deptList"
+                  node-key="id"
+                  :props="{ label: 'name', children: 'children' }"
+                  highlight-current
+                  default-expand-all
+                  @node-click="handleNodeClick"
+                />
+              </el-dialog>
             </el-row>
 
             <el-row>
@@ -173,7 +192,7 @@
                         style="width: 100%"
                       >
                         <el-table-column type="index" label="序号" width="60" />
-                         <el-table-column prop="score" label="权值" width="60" />
+                         <el-table-column prop="scoreRate" label="权值" width="60" />
                         <el-table-column prop="content" label="考点语句" width="800" />
                       </el-table>
                     </div>
@@ -185,21 +204,30 @@
                             width="60%"
                             :close-on-click-modal="false"
                             class="custom-dialog"
+                             draggable
                           >
                             <!-- 可滚动容器 -->
-                            <div style="height: 400px; overflow-y: auto;">
+                            <div style="height: 400px; overflow-y: auto;width:100%;">
                               <el-table
                                   :data="kaodianList"
-                                  style="width: 100%;"
+                                  style="width: 100%; "
                                   row-key="answerId"
                                   :default-expand-all="false"
                                   @row-contextmenu="(row, column, event) => handleTextRightClick(event, row)"
-
                                 >
 
-                                <el-table-column type="index" label="序号" width="60" />
-                                <el-table-column prop="score" label="权值" width="60" />
-                                <el-table-column prop="content" label="考点语句" width="600" />
+                                <el-table-column type="index" label="序号"  />
+                                <el-table-column label="权值" width="80">
+                                  <template #default="{ row }">
+                                    <el-input
+                                      v-model="row.scoreRate"
+                                      size="small"
+                                      placeholder="请输入"
+                                      style="width: 100%;"
+                                    />
+                                  </template>
+                                </el-table-column>
+                                <el-table-column prop="content" label="考点语句"  />
 
                                 <!-- 展开行 -->
                                 <el-table-column type="expand">
@@ -218,7 +246,8 @@
                                             v-model="scope.row.scoreRate"
                                             size="small"
                                             style="width: 70px;"
-                                           @input="updateScore(props.row)"
+                                            min="0"
+                                           
                                           />
                                         </template>
                                       </el-table-column>
@@ -272,67 +301,12 @@
 
                   </el-tab-pane>
            
-                <!-- <el-tab-pane name="medium">
-                  <template #label>
-                    <div class="custom-tabs-label">
-                      <p>媒体文件</p>
-                      <el-dropdown>
-                        <span class="el-dropdown-link" @click.stop="false">
-                          <div class="setting_icon"></div>
-                        </span>
-                        <template #dropdown>
-                          <el-dropdown-menu>
-                            <el-dropdown-item>
-                              <el-upload
-                                v-model:file-list="fileList"
-                                class="upload-demo"
-                                action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-                              >
-                                <el-button>导入</el-button>
-                              </el-upload>
-                            </el-dropdown-item>
-                            <el-dropdown-item>导出</el-dropdown-item>
-                            <el-dropdown-item>播放</el-dropdown-item>
-                            <el-dropdown-item>编辑</el-dropdown-item>
-                            <el-dropdown-item>删除选中</el-dropdown-item>
-                          </el-dropdown-menu>
-                        </template>
-                      </el-dropdown>
-                    </div>
-                  </template>
-                  <div class="block">
-                    <el-table
-                      :data="mediumList"
-                      style="width: 100%"
-                      @selection-change="handleMediumSelectionChange"
-                    >
-                      <el-table-column type="index" width="50" />
-                      <el-table-column type="selection" width="55" />
-                      <el-table-column prop="type" label="媒体类型" width="80" />
-                      <el-table-column prop="title" label="标题" />
-                      <el-table-column prop="displayIndex" label="显示序号" />
-                      <el-table-column prop="size" label="大小" />
-                    </el-table>
-                  </div>
-                </el-tab-pane> -->
+
                 <el-tab-pane name="annex">
                   <template #label>
                     <div class="custom-tabs-label">
                       <p>试题附件</p>
-                      <!-- <el-dropdown>
-                        <span class="el-dropdown-link" @click.stop="false">
-                          <div class="setting_icon"></div>
-                        </span>
-                        <template #dropdown>
-                          <el-dropdown-menu>
-                            <el-dropdown-item>导入单文件</el-dropdown-item>
-                            <el-dropdown-item>导入多文件</el-dropdown-item>
-                            <el-dropdown-item>导出</el-dropdown-item>
-                            <el-dropdown-item>删除</el-dropdown-item>
-                            <el-dropdown-item>帮助</el-dropdown-item>
-                          </el-dropdown-menu>
-                        </template>
-                      </el-dropdown> -->
+
                     </div>
                   </template>
                   <!-- 提示 -->
@@ -422,6 +396,8 @@
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { FormRules } from 'element-plus'
 import * as QuestionApi from '@/api/paper/question'
+import * as SpecialtyApi from '@/api/points'
+import { defaultProps, handleTree } from '@/utils/tree'
 import FileForm from './components/FileForm.vue';
 defineOptions({ name: 'ChoiceForm' })
 import type { TabPaneName } from 'element-plus'
@@ -434,6 +410,8 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
+  pointNamesVo:'',
+  chapteridDictTextVo:'',
   content: '',
   specialtyName: '',
   courseName: '',
@@ -441,7 +419,7 @@ const formData = ref({
   required: '',
   chapteridDictText: '',
   analysis: '',
-  quLevel: '',
+  quLevel: 0,
   pointNames: '',
  
   subjectName: '',
@@ -452,13 +430,13 @@ const formData = ref({
       quId: '',
       url: '',
       fileType: '1',
-      fileName: ''
+      fileName: '原始'
     },
     {
       quId: '',
       url: '',
       fileType: '2',
-      fileName: ''
+      fileName: '结果'
     }]
 })
 
@@ -490,24 +468,10 @@ const rightHandleClick = (tab, e) => {
     // 发起考点请求
     QuestionApi.getListByQuId(kaodianData.value.quId).then(res => {
       //  res 是接口返回的数据数组
-      kaodianList.value = res.map(item => {
-        const totalScore = item.examMysqlKeywordList?.reduce((sum, kw) => {
-          return sum + Number(kw.scoreRate || 0);
-        }, 0);
-        return {
-          ...item,
-          score: isNaN(totalScore) ? 0 : totalScore, // 如果是 NaN 则显示为 0
-        };
-      });
+      kaodianList.value = res;
     });
   }
 };
-function updateScore(parentRow: any) {
-  parentRow.score = (parentRow.examMysqlKeywordList || []).reduce((sum, kw) => {
-    const rate = parseFloat(kw.scoreRate);
-    return sum + (isNaN(rate) ? 0 : rate);
-  }, 0);
-}
 
 
 
@@ -582,6 +546,7 @@ function confirmKao() {
   const questionAnswerList = kaodianList.value.map(item => ({
     answerId: item.answerId,
     content: item.content,
+    scoreRate:item.scoreRate,
     examMysqlKeywordList: (item.examMysqlKeywordList || []).map(kw => ({
       keywordId: kw.keywordId,
       answerId: kw.answerId,
@@ -629,9 +594,10 @@ const fetchKaodianByUrl = async (url: string) => {
 
     // 将 SQL 字符串数组转换为 kaodianList 所需结构
     kaodianList.value = sqlList.map((sql, index) => ({
-       answerId: index + 1,       // 可自定义唯一ID生成逻辑
+      answerId: index + 1,       // 可自定义唯一ID生成逻辑
       quId: kaodianData.value.quId,                 // 如果有题目ID，可以在这里设置
       content: sql,
+      scoreRate:1,
       examMysqlKeywordList: []   // 默认空关键词列表
     }));
 
@@ -660,7 +626,7 @@ const beforeUpload = (file: File) => {
 
 function removeKeyword(parentRow: any, keywordIndex: number) {
   parentRow.examMysqlKeywordList.splice(keywordIndex, 1);
-  updateScore(parentRow); // 删除后更新score
+
 }
 
 
@@ -877,8 +843,10 @@ keywordList.value = res.keywords
     formData.value.specialtyName = queryParams.specialtyName
     formData.value.courseName = queryParams.courseName
     formData.value.subjectName = queryParams.subjectName
-    formData.value.pointNames=queryParams.pointNames
-    formData.value.chapteridDictText=queryParams.chapteridDictText
+    formData.value.pointNames=queryParams.pointNamesVo
+    formData.value.pointNamesVo=queryParams.pointNames
+    formData.value.chapteridDictText=queryParams.chapteridDictTextVo
+    formData.value.chapteridDictTextVo=queryParams.chapteridDictText
 
     
   }
@@ -942,7 +910,7 @@ const resetForm = () => {
     required: '',
     chapteridDictText: '',
     analysis: '',
-    quLevel: '0',
+    quLevel: 0,
     pointNames: '',
     subjectName: '',
     status: '0',
@@ -953,13 +921,13 @@ const resetForm = () => {
       quId: '',
       url: '',
       fileType: '1',
-      fileName: ''
+     fileName: '原始'
     },
     {
       quId: '',
       url: '',
       fileType: '2',
-      fileName: ''
+      fileName: '结果'
     }
   ]
   }
@@ -969,6 +937,62 @@ const resetForm = () => {
 
 }
 
+const selectedPointName = ref('')
+const selectedchapterText = ref('')
+const dialogVisiblePoints = ref(false)
+
+// 添加层级信息
+const handleTreeWithLevel = (list, level = 1) => {
+  return list.map(item => {
+    const node = { ...item, level }
+    if (item.children && item.children.length > 0) {
+      node.children = handleTreeWithLevel(item.children, level + 1)
+    }
+    return node
+  })
+}
+
+// 只允许点击第三级节点
+const treeRef = ref() // 引用 el-tree
+const handleNodeClick = (data, node) => {
+  if (data.level === 3) {
+    formData.value.pointNames = data.id
+    formData.value.pointNamesVo = data.name
+
+    //  获取父节点（章节名称）
+    const currentNode = treeRef.value.getNode(data)
+    const parentNode = currentNode.parent
+    if (parentNode && parentNode.data) {
+      formData.value.chapteridDictTextVo = parentNode.data.name
+      formData.value.chapteridDictText = parentNode.data.id
+    } else {
+      formData.value.chapteridDictText = ''
+    }
+
+    dialogVisiblePoints.value = false
+  } else {
+  }
+}
+
+
+
+const deptList = ref<Tree[]>([]) // 树形结构
+/** 获得部门树 */
+const getTree = async () => {
+  const res = await SpecialtyApi.listPoints()
+ const tree = handleTree(res)   
+   deptList.value = []                 
+  deptList.value = handleTreeWithLevel(tree) 
+  
+
+}
+const openPoints = async () => {
+  await getTree();
+    dialogVisiblePoints.value = true;
+}
+
+
+
 
 
 onMounted(() => {
diff --git a/src/views/paper/question/index.vue b/src/views/paper/question/index.vue
index a105293..003be3e 100644
--- a/src/views/paper/question/index.vue
+++ b/src/views/paper/question/index.vue
@@ -74,8 +74,8 @@
 <!--            />-->
 <!--          </el-form-item>-->
           <el-form-item>
-            <!-- <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
-            <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button> -->
+            <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
+            <!-- <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button> -->
           <el-button
           type="danger"
           class="ele-btn-del"
@@ -158,7 +158,7 @@
           <el-table-column
             label="章节名称"
             align="center"
-            prop="chapteridDictText"
+            prop="chapteridDictTextVo"
             :show-overflow-tooltip="true"
           />
           <!-- <el-table-column
@@ -182,7 +182,7 @@
           <el-table-column
               label="知识点"
               align="center"
-              prop="pointNames"
+              prop="pointNamesVo"
               :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -286,7 +286,7 @@
         <el-form-item label="学校" prop="name">
             <el-input
               v-model="queryParamsSchool.name"
-              placeholder="请输入试卷编号"
+              placeholder="请输入学校名称"
               clearable
               class="!w-240px"
               @keyup.enter="handleQuerySchool"
@@ -381,6 +381,8 @@ const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数
 
 const queryParams = reactive({
+  chapteridDictTextVo:'',
+  pointNamesVo:'',
   specialtyName: "",
   courseName: "",
   subjectName: "",
@@ -414,7 +416,12 @@ const getList = async () => {
  await getTreePoint();
   loading.value = true
   try {
-    const data = await QuestionApi.getQuestionList(queryParams);
+    const params = {
+      ...queryParams,
+      pointNames: queryParams.pointNamesVo,
+      chapteridDictText: queryParams.chapteridDictTextVo,
+    };
+    const data = await QuestionApi.getQuestionList(params);
     list.value = data.list
     total.value = data.total
   } finally {
@@ -444,15 +451,23 @@ const handleDeptNodeClick = async (row) => {
   // 判断点击的层级结构，进行入参
   if (!row.children != null){
   }
-  const specArr: any = findNamePathFromTreeList(respoint.value, row.id)
+  const specArr: any = findIdPathFromTreeList(respoint.value, row.id)
+  console.log(specArr+"specArr")
+
+console.log(specArr[1].name+"specArr[1].name")
+console.log(specArr[1].id+"specArr[1].name")
+  
   // 判断长度赋值
   if (specArr.length == 1) {
   }
   if (specArr.length == 2) {
   }
   if (specArr.length == 3) {
-    queryParams.chapteridDictText=specArr[1]
-    queryParams.pointNames = specArr[2]
+    queryParams.chapteridDictText=specArr[1].name;
+    queryParams.pointNames = specArr[2].name;
+
+    queryParams.chapteridDictTextVo = specArr[1].id;
+    queryParams.pointNamesVo = specArr[2].id;
   }
   await getList()
 }
@@ -516,7 +531,7 @@ const handleAudit = async () => {
   type: '0', 
   quIds: selectedRows.value
 }
-  // await QuestionApi.auditQuestion(requestBody)
+   await QuestionApi.auditQuestion(requestBody)
     message.success(t('推送成功'))
     // 刷新列表
     await getList()
@@ -560,6 +575,12 @@ const handleQuerySchool = () => {
   queryParamsSchool.pageNo = 1
   getSchoolList()
 }
+const resetQuerySchool = () => {
+   queryParamsSchool.name = ''
+ 
+}
+
+
 const handleCloseSyncDialog = () => {
   syncDialogVisible.value = false
   queryParamsSchool.name = ''
@@ -663,6 +684,26 @@ const findNamePath = (
   }
   return null
 }
+// 递归查找路径，返回包含 id 和 name 的路径数组
+const findIdNamePath = (
+  node: Tree,
+  targetId: number,
+  path: Array<{ id: number, name: string }> = []
+): Array<{ id: number, name: string }> | null => {
+  const currentPath = [...path, { id: node.id, name: node.name }]
+  if (node.id === targetId) {
+    return currentPath
+  }
+  if (node.children && node.children.length > 0) {
+    for (const child of node.children) {
+      const result = findIdNamePath(child, targetId, currentPath)
+      if (result) return result
+    }
+  }
+  return null
+}
+
+
 /** 入口函数：支持根节点是数组的情况 */
 const findNamePathFromTreeList = (treeList: Tree[], targetId: number): string[] | null => {
   for (const tree of treeList) {
@@ -671,6 +712,19 @@ const findNamePathFromTreeList = (treeList: Tree[], targetId: number): string[]
   }
   return null
 }
+
+
+// 遍历树列表查找路径
+const findIdPathFromTreeList = (
+  treeList: Tree[],
+  targetId: number
+): Array<{ id: number, name: string }> | null => {
+  for (const tree of treeList) {
+    const result = findIdNamePath(tree, targetId)
+    if (result) return result
+  }
+  return null
+}
 /** 添加/修改操作 */
 const formRef = ref()
 const cformRef = ref()
@@ -709,8 +763,9 @@ const importFormRef = ref()
 const handleStatusChange = async (row: any) => {
   try {
     // 修改状态的二次确认
-    await message.confirm('确认要修改' + row.quId + '"试题状态吗?')
+    await message.confirm('确认要修改' + row.quNum + '"试题状态吗?')
     // 发起修改状态
+    QuestionApi.updateQuStatus(row.quId,row.status);
     // 刷新列表
     await getList()
   } catch {
@@ -744,7 +799,15 @@ const handleCommand = (command: string, row: UserApi.UserVO) => {
 const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
-    await message.delConfirm()
+       await ElMessageBox.confirm(
+      '只能删除未被使用的试题,是否确认删除？',
+      '警告',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    );
     // 发起删除
     await QuestionApi.removeQuestions(id)
     message.success(t('common.delSuccess'))
@@ -760,7 +823,16 @@ const handleDeletes = async () => {
     message.error('请至少选择一条数据');
     return;
   }
-
+    // 删除的二次确认
+       await ElMessageBox.confirm(
+      '只能删除未被使用的试题,是否确认删除？',
+      '警告',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    );
   selectedRows.value = rows.map((d: any) => d.quId); // 保存选中的行数据
   await QuestionApi.removeQuestions(selectedRows.value)
     message.success(t('common.delSuccess'))
diff --git a/src/views/task/exam/components/steps/step1/components/step-edit.vue b/src/views/task/exam/components/steps/step1/components/step-edit.vue
index e25f2ed..2b1e225 100644
--- a/src/views/task/exam/components/steps/step1/components/step-edit.vue
+++ b/src/views/task/exam/components/steps/step1/components/step-edit.vue
@@ -43,9 +43,9 @@
       <el-form-item label="难度" prop="quLevel">
         <el-select v-model="form.quLevel" placeholder="请选择难度" :disabled="isUpdate">
           <el-option label="全部" :value="3" />
-          <el-option label="简单" :value="0" />
-          <el-option label="一般" :value="1" />
-          <el-option label="困难" :value="2" />
+          <el-option label="易" :value="0" />
+          <el-option label="中" :value="1" />
+          <el-option label="难" :value="2" />
         </el-select>
       </el-form-item>
 
@@ -346,7 +346,7 @@ const save = async () => {
     const fn = isUpdate.value ? updateScheme : addScheme
     await fn(payload)
     emit('done')
-    visible.value = false
+    // visible.value = false
   } finally {
     loading.value = false
   }
diff --git a/src/views/task/exam/components/steps/step2/components/step-add.vue b/src/views/task/exam/components/steps/step2/components/step-add.vue
index 3004318..2279f51 100644
--- a/src/views/task/exam/components/steps/step2/components/step-add.vue
+++ b/src/views/task/exam/components/steps/step2/components/step-add.vue
@@ -1,106 +1,399 @@
 <!-- 编辑弹窗 -->
 <template>
-<Dialog v-model="isVisible"    :title="'添加试卷'" width="460"    @open="handleOpen" center>
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        @submit.prevent=""
-      >
-        <el-form-item label="试卷数目" prop="num">
-          <el-input
-            clearable
-            v-model="form.num"
-            placeholder="请输入试卷数目"
-          />
-        </el-form-item>
-       
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" :loading="loading" @click="save">
-          保存
-        </el-button>
-      </template>
-    </Dialog>
-  </template>
-  <script setup>
-    import { ref, reactive, nextTick } from 'vue';
-  
-    import { useFormData } from '@/utils/use-form-data';
-    import { addPaper } from '@/api/system/paper';
-    const message = useMessage() // 消息弹窗
-    const props = defineProps({
-      /** 修改回显的数据 */
-      data: Object,
-      taskId: String ,
-      taskSpecialty: String,
-    });
-  
-    const emit = defineEmits(['done']);
-  
-    /** 弹窗是否打开 */
-    const isVisible = defineModel({ type: Boolean });
-  
-    /** 提交状态 */
-    const loading = ref(false);
-  
-    /** 表单实例 */
-    const formRef = ref(null);
-  
-    /** 表单数据 */
-    const [form, resetFields, assignFields] = useFormData({
-      num: '',
-      taskId: ''
-    });
-  
-    /** 表单验证规则 */
-    const rules = reactive({
-      num: [
-        { required: true, message: '请输入试卷数目', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
-      ]
-    });
+<Dialog v-model="isVisible" :title="'添加试卷'" width="460" @open="handleOpen" center>
+  <el-form
+    ref="formRef"
+    :model="form"
+    :rules="rules"
+    label-width="80px"
+    @submit.prevent=""
+  >
+    <el-form-item label="试卷数目" prop="num">
+      <el-input
+        clearable
+        v-model="form.num"
+        placeholder="请输入试卷数目"
+      />
+    </el-form-item>
 
-    /** 关闭弹窗 */
-    const handleCancel = () => {
-      isVisible.value = false;
+    <!-- 是否启用组卷范围 -->
+    <el-form-item label=" " label-width="0">
+      <div style="display: flex; align-items: center; gap: 10px;">
+        <el-checkbox v-model="form.useCustomScope">
+          自定义组卷范围
+        </el-checkbox>
+        <el-button v-if="form.useCustomScope" @click="handleScopeSetting">
+          组卷范围
+        </el-button>
+      </div>
+    </el-form-item>
+
+
+
+  </el-form>
+
+  <template #footer>
+    <el-button @click="handleCancel">取消</el-button>
+    <el-button type="primary" :loading="loading" @click="save">
+      保存
+    </el-button>
+  </template>
+</Dialog>
+
+
+
+<el-dialog v-model="scopeDialogVisible" title="设置组卷范围" width="80%" @closed="handleDialogClose">
+  <div style="display: flex;">
+    <!-- 左侧 -->
+    <div style="width: 40%; padding-right: 16px;">
+        <el-form-item label="分组类型">
+          <el-select v-model="selectedGroupType" placeholder="请选择" @change="loadLeftList">
+            <el-option label="练习" value="0" />
+            <el-option label="考试" value="1" />
+            <el-option label="冲刺练习" value="3" />
+          </el-select>
+        </el-form-item>
+
+    <el-tree
+      :data="leftTreeData"
+      node-key="id"
+      :props="{ label: 'label', children: 'children' }"
+       @node-click="handleNodeClick"
+    />
+
+    </div>
+
+    <!-- 右侧 -->
+    <div style="width: 60%; padding-left: 16px;">
+      <div style="font-weight: bold; margin-bottom: 8px;">已选试卷</div>
+     
+
+      <el-table
+        :data="rightList"
+        border
+        height="340"
+        :fit="true"
+      >
+        <el-table-column prop="taskName" label="任务名称" align="center"/>
+        <el-table-column label="任务分组" align="center">
+          <template #default="{ row }">
+            {{ getTaskTypeLabel(row.taskType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="试卷编号" align="center" />
+       <el-table-column prop="que"   label="题型"  align="center"   />
+        <el-table-column width="160" label="操作" align="center">
+          <template #default="{ row }">
+            <el-button type="text" size="small" @click="removeFromRightList(row)">移除</el-button>
+            <el-button type="text" size="small" @click="openQueDialog(row)">设置题型</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+
+  <!-- 弹窗底部按钮 -->
+  <template #footer>
+    <el-button @click="onCancel">取消</el-button>
+    <el-button type="primary" @click="handleScopeConfirm">确认</el-button>
+  </template>
+</el-dialog>
+<el-dialog v-model="queDialogVisible" title="选择题型" width="400px" center>
+  <el-checkbox
+    v-model="checkAll"
+    @change="handleCheckAllChange"
+    style="margin-bottom: 10px;"
+  >
+    题型名称
+  </el-checkbox>
+
+  <el-checkbox-group v-model="selectedQue" style="display: flex; flex-direction: column; gap: 8px;">
+    <el-checkbox
+      v-for="item in currentSpNames"
+      :key="item"
+      :label="item"
+    >{{ item }}</el-checkbox>
+  </el-checkbox-group>
+
+  <template #footer>
+    <el-button @click="queDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="confirmQue">确定</el-button>
+  </template>
+</el-dialog>
+
+
+</template>
+<script setup lang="ts">
+import { ref, reactive, nextTick } from 'vue';
+import * as SmsChannelApi from '@/api/system/task/index';
+import { useFormData } from '@/utils/use-form-data';
+import { addPaper ,addPaperBypaper} from '@/api/system/paper';
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  /** 修改回显的数据 */
+  data: Object,
+  taskId: String ,
+  taskSpecialty: String,
+});
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  signature: undefined,
+  status: undefined,
+  taskName:undefined,
+  createTime: [],
+  taskType:'3'
+})
+const emit = defineEmits(['done']);
+
+/** 弹窗是否打开 */
+const isVisible = defineModel({ type: Boolean });
+
+/** 提交状态 */
+const loading = ref(false);
+
+/** 表单实例 */
+const formRef = ref(null);
+
+/** 表单数据 */
+const [form, resetFields, assignFields] = useFormData({
+  num: '',
+  taskId: ''
+});
+
+/** 表单验证规则 */
+const rules = reactive({
+  num: [
+    { required: true, message: '请输入试卷数目', trigger: 'blur' },
+    { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
+  ]
+});
+
+    //组卷范围
+const scopeDialogVisible = ref(false);
+let isConfirmClosing = false;
+const queDialogVisible = ref(false);
+ 
+const selectedGroupType = ref('');
+const leftList = ref([]);
+const rightList = ref([]);
+const leftTreeData = ref([]);
+
+
+// 选中某个分组类型时，加载左侧列表
+const loadLeftList = async () => {
+  // 示例：根据 selectedGroupType 获取数据
+  queryParams.taskType=selectedGroupType.value
+  const res = await SmsChannelApi.pageTaskPapers(queryParams)
+  leftTreeData.value = convertToTreeData(res.list);
+};
+
+
+// 从右侧列表中移除
+const removeFromRightList = (row) => {
+  rightList.value = rightList.value.filter((item) => item.id !== row.id);
+};
+
+// 点击确认
+const handleScopeConfirm = () => {
+   isConfirmClosing = true;
+  scopeDialogVisible.value = false;
+  // 提交 rightList.value 到后台或保存状态
+  console.log('选中的试卷：', rightList.value);
+};
+
+const handleScopeSetting = () => {
+  scopeDialogVisible.value = true;
+};
+
+
+
+const convertToTreeData = (taskList) => {
+  return taskList.map(task => {
+    return {
+      label: task.taskName,
+      children: (task.educationPaperList || []).map(paper => ({
+        label: paper.num || '未命名试卷',
+        id: paper.paperId,
+        num:paper.num,
+        taskName: task.taskName,
+        taskType: task.taskType,
+        que: '全部' ,
+        educationPaperSchemeList:task.educationPaperSchemeList
+      }))
     };
-  
-    /** 保存编辑 */
-    const save = () => {
-  formRef.value?.validate?.((valid) => {
-    if (!valid) {
-      return;
-    }
-    loading.value = true;
-    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
-      .then((msg) => {
-        loading.value = false;
-        message.success('新增成功！');
-        handleCancel();
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
   });
 };
+const handleNodeClick = (data) => {
+  if (!data.children) {
+    // 是试卷节点
+    if (!rightList.value.find(p => p.id === data.id)) {
+      rightList.value.push(data);
+    }
+  }
+};
+const getTaskTypeLabel = (type) => {
+  const map = {
+    '0': '练习',
+    '1': '考试',
+    '3': '冲刺练习'
+  };
+  return map[type] || '未知';
+};
+
+
+const handleDialogClose = () => {
+   if (!isConfirmClosing) {
+    selectedGroupType.value='',
+    rightList.value = [];
+    leftTreeData.value=[] // 只有不是确认才清空
+  }
+    isConfirmClosing = false; // 重置标志位
+}
+const onCancel = () => {
+  isConfirmClosing = false;
+  selectedGroupType.value='',
+  rightList.value = [];
+  leftTreeData.value=[]
+  scopeDialogVisible.value = false;
+};
+
+
+const checkAll = ref(false);
+const selectedQue = ref<string[]>([]);
+const currentSpNames = ref<Array<string>>([]); // 当前题型名列表
+const selectedRow = ref<any>(null); // 当前选中的试卷数据（可选）
+
+const openQueDialog = (row) => {
+
+  // 设置当前选中的题型列表
+  currentSpNames.value = row.educationPaperSchemeList?.map(item => item.spName) || [];
+
+  // 设置当前行（选中的试卷）用于后续保存
+  selectedRow.value = row;
+  queDialogVisible.value = true;
+};
+///
+
+watch(selectedQue, (val) => {
+  if (val.length === currentSpNames.value.length) {
+    checkAll.value = true;
+  } else {
+    checkAll.value = false;
+  }
+});
+
+const handleCheckAllChange = (val: boolean) => {
+  if (val) {
+    selectedQue.value = [...currentSpNames.value];
+  } else {
+    selectedQue.value = [];
+  }
+};
+
+
+
+// 确认选择题型，把逗号分隔字符串赋给该行que字段
+const confirmQue = async () => {
+  if (selectedRow.value) {
+    try {
+      const payload = {
+        taskId: props.taskId,
+        que: selectedQue.value // 数组形式传递
+      };
+
+     const res= await SmsChannelApi.checkType(payload);
+
+      // 可选：赋值用于前端展示（逗号拼接）
+      selectedRow.value.que = selectedQue.value.join(',');
+
+      ElMessage.success('题型设置成功');
+    } catch (err) {
+      console.error(err);
+      ElMessage.error('题型设置失败');
+    }
+  }
+
+  // 关闭弹窗 & 清空数据
+  queDialogVisible.value = false;
+  selectedRow.value = null;
+  selectedQue.value = [];
+  checkAll.value = false;
+};
+
+
+
+
+
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    isVisible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+formRef.value?.validate?.((valid) => {
+  if (!valid) {
+    return;
+  }
+  loading.value = true;
+  if (form.useCustomScope) {
+    console.log( form.num+"num")
+    console.log(rightList.value+"rightList.value")
+
+      if (!rightList.value || rightList.value.length === 0) {
+        ElMessage.warning('请先设置组卷范围！');
+        loading.value = false;
+        return; // 阻止后续逻辑
+      }
+    console.log( props.taskId)
+    const payload = {
+      num: form.num,
+      taskId: props.taskId,
+      paperList: rightList.value, // 如果是数组，字段名建议有“List”或“Array”
+    };
+    addPaperBypaper(payload)
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    console.log("自定义范围!");
+    }else{
+     console.log("不是自定义范围!");
+    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    }
+
+});
+};
 
   
-    /** 弹窗打开事件 */
-    const handleOpen = () => {
-        resetFields();
-        form.taskId = props.taskId; // 新增时赋值 taskId
-        form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
-      nextTick(() => {
-        nextTick(() => {
-          formRef.value?.clearValidate?.();
-        });
-      });
-    };
-    defineExpose({ open })
-  </script>
-  
\ No newline at end of file
+/** 弹窗打开事件 */
+const handleOpen = () => {
+    resetFields();
+    form.taskId = props.taskId; // 新增时赋值 taskId
+    form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
+  nextTick(() => {
+    nextTick(() => {
+      formRef.value?.clearValidate?.();
+    });
+  });
+};
+defineExpose({ open })
+</script>
diff --git a/src/views/task/exam/components/steps/step2/components/step-edit.vue b/src/views/task/exam/components/steps/step2/components/step-edit.vue
index d93a95d..1dcc3ca 100644
--- a/src/views/task/exam/components/steps/step2/components/step-edit.vue
+++ b/src/views/task/exam/components/steps/step2/components/step-edit.vue
@@ -22,7 +22,8 @@
           <dict-tag :type="DICT_TYPE.EXAM_QUE_DIFF" :value="scope.row.quLevel" />
         </template>
       </el-table-column>
-      <el-table-column label="知识点" prop="pointNames" align="left" />
+      <el-table-column label="章节" prop="pointNamesVo" align="left" />
+      <el-table-column label="知识点" prop="chapteridDictTextVo" align="left" />
   
     </el-table>
     </div>
@@ -172,14 +173,14 @@
 
 <Dialog v-model="visibleChange" :title="'换题列表'" width="80%" center  @close="handleCancelQue" >
   <ContentWrap>
-    <div style="display: flex; gap: 20px;height: 500px; width: 100%;">
+    <div style="display: flex; gap: 20px;height: 600px; width: 100%;">
 
       <!-- 左侧题目表格 -->
       <div style="flex: 3;">
 
                <!-- 搜索条件区域 -->
             <div style="margin-bottom: 16px; display: flex; gap: 12px; align-items: center; flex-wrap: wrap;">
-              <el-input
+              <!-- <el-input
                 v-model="queryParams.pointNames"
                 placeholder="试题知识点"
                 clearable
@@ -194,7 +195,7 @@
                 <el-option label="简单" value="0" />
                 <el-option label="一般" value="1" />
                 <el-option label="困难" value="2" />
-              </el-select>
+              </el-select> -->
               <el-input
                 v-model="queryParams.quNum"
                 placeholder="试题编号"
@@ -216,13 +217,13 @@
           <el-table-column label="试题编号" align="center"  prop="quNum" :show-overflow-tooltip="true"/>
           <el-table-column label="专业" align="center" prop="specialtyName" width="120" />
           <el-table-column label="课程" align="center" prop="courseName" :show-overflow-tooltip="true" />
-          <el-table-column label="章节名称" align="center" prop="chapteridDictText" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="章节名称" align="center" prop="chapteridDictText" :show-overflow-tooltip="true" /> -->
           <el-table-column label="难度" align="center" prop="quLevel" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.EXAM_QUE_DIFF" :value="scope.row.quLevel" />
             </template>
           </el-table-column>
-          <el-table-column label="知识点" align="center" prop="pointNames" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="知识点" align="center" prop="pointNames" :show-overflow-tooltip="true" /> -->
           <!-- <el-table-column label="审核状态" align="center" prop="audit" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.QUESTION_AUDIT" :value="scope.row.audit" />
@@ -447,6 +448,8 @@ const handleChange =async () => {
     message.warning('请先选中一个原题');
     return;
   }
+
+  console.log(selectedQuestion.value.quId+"selectedQuestion.value.quId")
   visibleChange.value = true;
    await getList();
 };
@@ -519,6 +522,11 @@ const handleRowClick = (row: any) => {
 const getList = async () => {
   loading.value = true
 queryParams.subjectName=selectedQuestion.value.subjectName
+queryParams.pointNames=selectedQuestion.value.pointNames
+queryParams.chapteridDictText=selectedQuestion.value.chapteridDictText
+queryParams.quLevel=selectedQuestion.value.quLevel
+queryParams.specialtyName=selectedQuestion.value.specialtyName
+queryParams.courseName=selectedQuestion.value.courseName
   try {
     const data = await QuestionApi.getQuestionlistAnswer(queryParams);
     list.value = data.list
diff --git a/src/views/task/exam/components/steps/step2/index.vue b/src/views/task/exam/components/steps/step2/index.vue
index 5819ae6..c703fa0 100644
--- a/src/views/task/exam/components/steps/step2/index.vue
+++ b/src/views/task/exam/components/steps/step2/index.vue
@@ -54,7 +54,7 @@
           plain
           @click="openSet"
         >
-          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷调整
+          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷方式
         </el-button>
       <el-button
         type="primary"
@@ -117,7 +117,6 @@
             link
             type="primary"
             @click="openLook('look', scope.row.paperId)"
-            v-hasPermi="['system:sms-channel:update']"
           >
             查看
           </el-button>
@@ -125,15 +124,13 @@
             link
             type="primary"
             @click="openEdit('update', scope.row)"
-            v-hasPermi="['system:sms-channel:update']"
           >
             编辑
           </el-button>
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.paperId)"
-            v-hasPermi="['system:sms-channel:delete']"
+            @click="handleDelete(scope.row)"
           >
             删除
           </el-button>
@@ -344,10 +341,14 @@ const openLook = (type: string, paperId?: number) => {
 
 
 // 删除操作
-const handleDelete = async (id: number) => {
+const handleDelete = async (row?: any) => {
+      if (row?.counts > 0) {
+      ElMessage.warning('当前试卷使用次数大于0，不允许删除！');
+      return; 
+    }
   try {
     await message.delConfirm();
-    await PaperApi.removePaper(id);
+    await PaperApi.removePaper(row.paperId);
     message.success(t('common.delSuccess'));
     await getList();
   } catch (error) {
diff --git a/src/views/task/exam/components/steps/step3/index.vue b/src/views/task/exam/components/steps/step3/index.vue
index 1ea3257..2f4057c 100644
--- a/src/views/task/exam/components/steps/step3/index.vue
+++ b/src/views/task/exam/components/steps/step3/index.vue
@@ -5,15 +5,11 @@
       <!-- 第一个 tab - 通用参数 -->
       <el-tab-pane label="通用参数" name="tab1">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
+
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="是否显示试题编号">
-                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-
               <!-- 是否使用监考密码验证 -->
-              <!-- <el-form-item label="是否使用监考密码验证">
+            <el-form-item label="是否使用监考密码验证">
             <el-switch 
               v-model="form.isExamPassword" 
               active-value="0" 
@@ -21,67 +17,14 @@
               active-text="是" 
               inactive-text="否" 
               @change="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item> 
 
               <!-- 监考密码 -->
-              <!-- <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
+              <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
             <el-input v-model="form.examPassword" placeholder="请输入监考密码" @input="handleFormChange" />
-          </el-form-item> -->
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示试卷编号">
-                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否显示解析按钮">
-                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示重答按钮">
-                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-
-            </el-col>
-            <!-- <el-col :span="12">
-          <el-form-item label="考生答题时是否显示试题编号">
-            <el-switch 
-              v-model="form.isAnswerId" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
           </el-form-item>
-      </el-col> -->
-          </el-row>
-
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否启用考场设置">
-                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-
-
-            <el-col :span="12">
-              <el-form-item label="是否显示答案按钮">
-                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-
+           </el-col>
+             <el-col :span="12">
               <!-- 练习成绩保存 -->
               <el-form-item label="练习成绩保存">
                 <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
@@ -105,26 +48,69 @@
         </el-col> -->
 
 
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+
+              <el-form-item label="考生答题时是否显示试题编号">
+                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示试卷编号">
+                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否显示解析按钮">
+                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示重答按钮">
+                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否启用考场设置">
+                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="是否显示答案按钮">
+                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+
             <el-col :span="12">
               <el-form-item label="是否有测评时长限制">
                 <el-switch v-model="form.isTime" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
                   @change="handleFormChange" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <!-- <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
-        </el-col> -->
-
             <el-col :span="12">
               <el-form-item label="测评时长">
                 <el-time-picker v-model="form.examTime" value-format="HH:mm:ss" placeholder="请设置测评时长" class="ele-fluid"
@@ -145,17 +131,31 @@
           </el-form-item>
         </el-col> -->
           </el-row>
-
-
           <el-row :gutter="20">
 
 
+
+          <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="是否显示成绩">
+                <el-switch v-model="form.isScore" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
+              <el-form-item label="是否显示成绩明细">
+                <el-switch v-model="form.isScoreDetail" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+
               <!-- <el-form-item label="定时检查与学生端联通性，每">
             <el-input-number v-model="form.isConnect"  label="分钟" @change="handleFormChange" />
             <span>分钟传一次,断联直接交卷</span>
           </el-form-item> -->
-            </el-col>
+          
           </el-row>
 
 
@@ -235,7 +235,14 @@
               </el-form-item>
             </el-col>
           </el-row>
-
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否允许复制题干">
+                <el-switch v-model="form.isCpoy" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="考试注意事项提醒" name="tab4">
@@ -271,7 +278,7 @@ const form = ref({
   driver: '',             // 存放系统盘
   directory: '',          // 考试目录名称
   uploadTime: '',         // 上传间隔时间
-  isDel: '',
+  isCpoy: '',
   isRepeat: '',           // 是否删除目录
   isAnswer: '',
   isLook: '',
@@ -279,7 +286,9 @@ const form = ref({
   isFile: '',
   isNet: '',
   isScreen: '',
-  warn: ''
+  warn: '',
+  isScore:'',
+  isScoreDetail:'',
 })
 
 const activeTab = ref('tab1')
diff --git a/src/views/task/exam/components/steps/step5/components/person-edit.vue b/src/views/task/exam/components/steps/step5/components/person-edit.vue
index 3c57ff3..8b0dcd7 100644
--- a/src/views/task/exam/components/steps/step5/components/person-edit.vue
+++ b/src/views/task/exam/components/steps/step5/components/person-edit.vue
@@ -187,7 +187,7 @@ const removeBatch = async () => {
   }
 
   await ElMessageBox.confirm(
-    '确定要删除选中的人员吗？',
+    '只能删除待考状态的学生,是否确认删除？',
     '警告',
     {
       confirmButtonText: '确定',
diff --git a/src/views/task/exam/components/steps/step5/index.vue b/src/views/task/exam/components/steps/step5/index.vue
index b002c0b..99ee397 100644
--- a/src/views/task/exam/components/steps/step5/index.vue
+++ b/src/views/task/exam/components/steps/step5/index.vue
@@ -196,7 +196,15 @@ const handleDeletes = async () => {
     message.error('请至少选择一条数据');
     return;
   }
-
+  await ElMessageBox.confirm(
+    '只能删除待考状态的学生,是否确认删除？',
+    '警告',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  );
   selectedRows.value = rows.map((d: any) => d.id); // 保存选中的行数据
 
   const deleteData = {
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step1/components/step-edit.vue b/src/views/task/selftrans/collegeexam/components/steps/step1/components/step-edit.vue
index eec693a..a459246 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step1/components/step-edit.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step1/components/step-edit.vue
@@ -43,9 +43,9 @@
       <el-form-item label="难度" prop="quLevel">
         <el-select v-model="form.quLevel" placeholder="请选择难度" :disabled="isUpdate">
           <el-option label="全部" :value="3" />
-          <el-option label="简单" :value="0" />
-          <el-option label="一般" :value="1" />
-          <el-option label="困难" :value="2" />
+          <el-option label="易" :value="0" />
+          <el-option label="中" :value="1" />
+          <el-option label="难" :value="2" />
         </el-select>
       </el-form-item>
 
@@ -346,7 +346,7 @@ const save = async () => {
     const fn = isUpdate.value ? updateScheme : addScheme
     await fn(payload)
     emit('done')
-    visible.value = false
+    // visible.value = false
   } finally {
     loading.value = false
   }
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step2/components/step-add.vue b/src/views/task/selftrans/collegeexam/components/steps/step2/components/step-add.vue
index 7564d1c..6c12367 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step2/components/step-add.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step2/components/step-add.vue
@@ -1,106 +1,388 @@
 <!-- 编辑弹窗 -->
 <template>
-<Dialog v-model="isVisible"    :title="'添加试卷'" width="460"    @open="handleOpen" center>
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        @submit.prevent=""
-      >
-        <el-form-item label="试卷数目" prop="num">
-          <el-input
-            clearable
-            v-model="form.num"
-            placeholder="请输入试卷数目"
-          />
-        </el-form-item>
-       
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" :loading="loading" @click="save">
-          保存
-        </el-button>
-      </template>
-    </Dialog>
-  </template>
-  <script setup>
-    import { ref, reactive, nextTick } from 'vue';
-  
-    import { useFormData } from '@/utils/use-form-data';
-    import { addPaper } from '@/api/system/paper';
-    const message = useMessage() // 消息弹窗
-    const props = defineProps({
-      /** 修改回显的数据 */
-      data: Object,
-      taskId: String ,
-      taskSpecialty: String,
-    });
-  
-    const emit = defineEmits(['done']);
-  
-    /** 弹窗是否打开 */
-    const isVisible = defineModel({ type: Boolean });
-  
-    /** 提交状态 */
-    const loading = ref(false);
-  
-    /** 表单实例 */
-    const formRef = ref(null);
-  
-    /** 表单数据 */
-    const [form, resetFields, assignFields] = useFormData({
-      num: '',
-      taskId: ''
-    });
-  
-    /** 表单验证规则 */
-    const rules = reactive({
-      num: [
-        { required: true, message: '请输入试卷数目', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
-      ]
-    });
+<Dialog v-model="isVisible" :title="'添加试卷'" width="460" @open="handleOpen" center>
+  <el-form
+    ref="formRef"
+    :model="form"
+    :rules="rules"
+    label-width="80px"
+    @submit.prevent=""
+  >
+    <el-form-item label="试卷数目" prop="num">
+      <el-input
+        clearable
+        v-model="form.num"
+        placeholder="请输入试卷数目"
+      />
+    </el-form-item>
 
-    /** 关闭弹窗 */
-    const handleCancel = () => {
-      isVisible.value = false;
+    <!-- 是否启用组卷范围 -->
+    <el-form-item label=" " label-width="0">
+      <div style="display: flex; align-items: center; gap: 10px;">
+        <el-checkbox v-model="form.useCustomScope">
+          自定义组卷范围
+        </el-checkbox>
+        <el-button v-if="form.useCustomScope" @click="handleScopeSetting">
+          组卷范围
+        </el-button>
+      </div>
+    </el-form-item>
+
+
+
+  </el-form>
+
+  <template #footer>
+    <el-button @click="handleCancel">取消</el-button>
+    <el-button type="primary" :loading="loading" @click="save">
+      保存
+    </el-button>
+  </template>
+</Dialog>
+
+
+
+<el-dialog v-model="scopeDialogVisible" title="设置组卷范围" width="80%">
+  <div style="display: flex;">
+    <!-- 左侧 -->
+    <div style="width: 40%; padding-right: 16px;">
+        <el-form-item label="分组类型">
+          <el-select v-model="selectedGroupType" placeholder="请选择" @change="loadLeftList">
+            <el-option label="练习" value="0" />
+            <el-option label="考试" value="1" />
+            <el-option label="冲刺练习" value="3" />
+          </el-select>
+        </el-form-item>
+
+    <el-tree
+      :data="leftTreeData"
+      node-key="id"
+      :props="{ label: 'label', children: 'children' }"
+       @node-click="handleNodeClick"
+    />
+
+    </div>
+
+    <!-- 右侧 -->
+    <div style="width: 60%; padding-left: 16px;">
+      <div style="font-weight: bold; margin-bottom: 8px;">已选试卷</div>
+     
+
+      <el-table
+        :data="rightList"
+        border
+        height="340"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="taskName" label="任务名称" align="center"/>
+        <el-table-column label="任务分组" align="center">
+          <template #default="{ row }">
+            {{ getTaskTypeLabel(row.taskType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="试卷编号" align="center" />
+       <el-table-column prop="que" label="题型" align="center"/>
+        <el-table-column width="160" label="操作" align="center">
+          <template #default="{ row }">
+            <el-button type="text" size="small" @click="removeFromRightList(row)">移除</el-button>
+            <el-button type="text" size="small" @click="openQueDialog(row)">设置题型</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+
+  <!-- 弹窗底部按钮 -->
+  <template #footer>
+    <el-button @click="scopeDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="handleScopeConfirm">确认</el-button>
+  </template>
+</el-dialog>
+<el-dialog v-model="queDialogVisible" title="选择题型" width="400px" center>
+  <el-checkbox
+    v-model="checkAll"
+    @change="handleCheckAllChange"
+    style="margin-bottom: 10px;"
+  >
+    题型名称
+  </el-checkbox>
+
+  <el-checkbox-group v-model="selectedQue" style="display: flex; flex-direction: column; gap: 8px;">
+    <el-checkbox
+      v-for="item in currentSpNames"
+      :key="item"
+      :label="item"
+    >{{ item }}</el-checkbox>
+  </el-checkbox-group>
+
+  <template #footer>
+    <el-button @click="queDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="confirmQue">确定</el-button>
+  </template>
+</el-dialog>
+
+
+</template>
+<script setup lang="ts">
+import { ref, reactive, nextTick } from 'vue';
+import * as SmsChannelApi from '@/api/system/task/index';
+import { useFormData } from '@/utils/use-form-data';
+import { addPaper ,addPaperBypaper} from '@/api/system/paper';
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  /** 修改回显的数据 */
+  data: Object,
+  taskId: String ,
+  taskSpecialty: String,
+});
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  signature: undefined,
+  status: undefined,
+  taskName:undefined,
+  createTime: [],
+  taskType:'3'
+})
+const emit = defineEmits(['done']);
+
+/** 弹窗是否打开 */
+const isVisible = defineModel({ type: Boolean });
+
+/** 提交状态 */
+const loading = ref(false);
+
+/** 表单实例 */
+const formRef = ref(null);
+
+/** 表单数据 */
+const [form, resetFields, assignFields] = useFormData({
+  num: '',
+  taskId: ''
+});
+
+/** 表单验证规则 */
+const rules = reactive({
+  num: [
+    { required: true, message: '请输入试卷数目', trigger: 'blur' },
+    { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
+  ]
+});
+
+    //组卷范围
+const scopeDialogVisible = ref(false);
+const queDialogVisible = ref(false);
+ 
+const selectedGroupType = ref('');
+const leftList = ref([]);
+const rightList = ref([]);
+const leftTreeData = ref([]);
+
+
+// 选中某个分组类型时，加载左侧列表
+const loadLeftList = async () => {
+  // 示例：根据 selectedGroupType 获取数据
+  queryParams.taskType=selectedGroupType.value
+  const res = await SmsChannelApi.pageTaskPapers(queryParams)
+  leftTreeData.value = convertToTreeData(res.list);
+};
+
+// 双击左侧行，加入右侧列表
+const handleRowDblClick = (row) => {
+  if (!rightList.value.find((r) => r.id === row.id)) {
+    rightList.value.push({ ...row });
+  }
+};
+
+// 从右侧列表中移除
+const removeFromRightList = (row) => {
+  rightList.value = rightList.value.filter((item) => item.id !== row.id);
+};
+
+// 点击确认
+const handleScopeConfirm = () => {
+  scopeDialogVisible.value = false;
+  // 提交 rightList.value 到后台或保存状态
+  console.log('选中的试卷：', rightList.value);
+};
+
+const handleScopeSetting = () => {
+  scopeDialogVisible.value = true;
+};
+
+
+
+const convertToTreeData = (taskList) => {
+  return taskList.map(task => {
+    return {
+      label: task.taskName,
+      children: (task.educationPaperList || []).map(paper => ({
+        label: paper.num || '未命名试卷',
+        id: paper.paperId,
+        num:paper.num,
+        taskName: task.taskName,
+        taskType: task.taskType,
+        que: '全部' ,
+        educationPaperSchemeList:task.educationPaperSchemeList
+      }))
     };
-  
-    /** 保存编辑 */
-    const save = () => {
-  formRef.value?.validate?.((valid) => {
-    if (!valid) {
-      return;
-    }
-    loading.value = true;
-    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
-      .then((msg) => {
-        loading.value = false;
-        message.success(msg);
-        handleCancel();
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
   });
 };
+const handleNodeClick = (data) => {
+  if (!data.children) {
+    // 是试卷节点
+    if (!rightList.value.find(p => p.id === data.id)) {
+      rightList.value.push(data);
+    }
+  }
+};
+const getTaskTypeLabel = (type) => {
+  const map = {
+    '0': '练习',
+    '1': '考试',
+    '3': '冲刺练习'
+  };
+  return map[type] || '未知';
+};
+
+const selectedRows = ref([]);
+const handleSelectionChange = (rows) => {
+  selectedRows.value = rows;
+};
+const checkAll = ref(false);
+const selectedQue = ref<string[]>([]);
+const currentSpNames = ref<Array<string>>([]); // 当前题型名列表
+const selectedRow = ref<any>(null); // 当前选中的试卷数据（可选）
+
+const openQueDialog = (row) => {
+
+  // 设置当前选中的题型列表
+  currentSpNames.value = row.educationPaperSchemeList?.map(item => item.spName) || [];
+
+  // 设置当前行（选中的试卷）用于后续保存
+  selectedRow.value = row;
+  queDialogVisible.value = true;
+};
+///
+
+watch(selectedQue, (val) => {
+  if (val.length === currentSpNames.value.length) {
+    checkAll.value = true;
+  } else {
+    checkAll.value = false;
+  }
+});
+
+const handleCheckAllChange = (val: boolean) => {
+  if (val) {
+    selectedQue.value = [...currentSpNames.value];
+  } else {
+    selectedQue.value = [];
+  }
+};
+
+
+
+// 确认选择题型，把逗号分隔字符串赋给该行que字段
+const confirmQue = async () => {
+  if (selectedRow.value) {
+    try {
+      const payload = {
+        taskId: props.taskId,
+        que: selectedQue.value // 数组形式传递
+      };
+
+     const res= await SmsChannelApi.checkType(payload);
+
+      // 可选：赋值用于前端展示（逗号拼接）
+      selectedRow.value.que = selectedQue.value.join(',');
+
+      ElMessage.success('题型设置成功');
+    } catch (err) {
+      console.error(err);
+      ElMessage.error('题型设置失败');
+    }
+  }
+
+  // 关闭弹窗 & 清空数据
+  queDialogVisible.value = false;
+  selectedRow.value = null;
+  selectedQue.value = [];
+  checkAll.value = false;
+};
+
+
+
+
+
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    isVisible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+formRef.value?.validate?.((valid) => {
+  if (!valid) {
+    return;
+  }
+  loading.value = true;
+  if (form.useCustomScope) {
+    console.log( form.num+"num")
+    console.log(rightList.value+"rightList.value")
+
+      if (!rightList.value || rightList.value.length === 0) {
+        ElMessage.warning('请先设置组卷范围！');
+        return; // 阻止后续逻辑
+      }
+    console.log( props.taskId)
+    const payload = {
+      num: form.num,
+      taskId: props.taskId,
+      paperList: rightList.value, // 如果是数组，字段名建议有“List”或“Array”
+    };
+    addPaperBypaper(payload)
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    console.log("自定义范围!");
+    }else{
+    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    }
+
+});
+};
 
   
-    /** 弹窗打开事件 */
-    const handleOpen = () => {
-        resetFields();
-        form.taskId = props.taskId; // 新增时赋值 taskId
-        form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
-      nextTick(() => {
-        nextTick(() => {
-          formRef.value?.clearValidate?.();
-        });
-      });
-    };
-    defineExpose({ open })
-  </script>
-  
\ No newline at end of file
+/** 弹窗打开事件 */
+const handleOpen = () => {
+    resetFields();
+    form.taskId = props.taskId; // 新增时赋值 taskId
+    form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
+  nextTick(() => {
+    nextTick(() => {
+      formRef.value?.clearValidate?.();
+    });
+  });
+};
+defineExpose({ open })
+</script>
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step2/index copy.vue b/src/views/task/selftrans/collegeexam/components/steps/step2/index copy.vue
deleted file mode 100644
index 1755b28..0000000
--- a/src/views/task/selftrans/collegeexam/components/steps/step2/index copy.vue	
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-
-  <ContentWrap>
-     <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-     
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:sms-channel:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增</el-button
-        >
-      </el-form-item>
-    </el-form> 
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="试卷编号" align="center" prop="paperId" />
-      <el-table-column label="使用次数" align="center" prop="counts" />
-      <el-table-column label="抽卷方式" align="center" prop="rollUp">
-        <template #default="scope">
-        <span v-if="scope.row.quLevel === '0'">固定</span>
-        <span v-else-if="scope.row.quLevel === '1'">AB卷</span>
-        <span v-else-if="scope.row.quLevel === '2'">随机</span>
-        <span v-else-if="scope.row.quLevel === '3'">自选</span>
-        <span v-else>未知</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="AB卷" align="center" prop="isAb">
-        <template #default="scope">
-        <span v-if="scope.row.quLevel === '0'">A卷</span>
-        <span v-else-if="scope.row.quLevel === '1'">B卷</span>
-        <span v-else>未知</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="status" >
-      <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.status" />
-        </template>
-    </el-table-column>
-      
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openEdit('update', scope.row)"
-            v-hasPermi="['system:sms-channel:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:sms-channel:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-
-
-
-<paper-add  v-model="showAdd"  :task-Id="taskId" :task-specialty="taskSpecialty"   />
-    <paper-edit v-model="showEdit" :data="current" />
-    <!-- <paper-look v-model="showLook" :paper-id="paperId"  /> -->
-    <paper-set  v-model="showSet"  :task-Id="taskId"  />
-</template>
-<script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-
-import * as SmsChannelApi from '@/api/system/paper';
-import PaperEdit from './components/step-edit.vue';
-  import PaperAdd from './components/step-add.vue';
-  import PaperLook from './components/step-look.vue';
-  import PaperSet from './components/step-set.vue';
-  import PaperSearch from './components/step-search.vue';
-  import { pagePapers, removePapers, exportPapers } from '@/api/system/paper';
-
-
-
-defineOptions({ name: 'SystemPaper' });
-  const props = defineProps({
-    taskSpecialty: {
-    type: String,
-    default: ''
-  },
-  taskId: {
-    type: String,
-    default: ''
-  }
-})
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-
-  /** 当前编辑数据 */
-  const current = ref<object>();
-
-  /** 是否显示编辑弹窗 */
-  const showEdit = ref(false);
-
-  const showLook = ref(false);
-
-  const showAdd = ref(false);
-
-  const showSet = ref(false);
-  
-
-const smsChannelFormRef = ref()
-const taskEditRef = ref()
-const taskAddRef = ref()
-const taskTempRef = ref()
-
-
-
-const loading = ref(false) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 列表的数据
-const queryFormRef = ref() // 搜索的表单
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  signature: undefined,
-  status: undefined,
-  createTime: []
-})
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const res = await SmsChannelApi.pagePapers(queryParams)
-    console.log(res)
-    list.value = res
-    total.value = res.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref();
-const openForm = (type: string, id?: number) => {
-  showAdd.value = true
-  taskAddRef.value?.open(type, id)
-}
-
-const openEdit = (type: string, row?: object) => {
-  showEdit.value = true
-  current.value = row
-  console.log( current.value )
-  taskEditRef.value?.open(type, row)
-}
-
-
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SmsChannelApi.removePaper(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step2/index.vue b/src/views/task/selftrans/collegeexam/components/steps/step2/index.vue
index d196e6a..bd2e785 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step2/index.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step2/index.vue
@@ -54,7 +54,7 @@
           plain
           @click="openSet"
         >
-          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷调整
+          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷方式
         </el-button>
          <el-button
           type="primary"
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step3/index.vue b/src/views/task/selftrans/collegeexam/components/steps/step3/index.vue
index 1ea3257..54d33d2 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step3/index.vue
@@ -5,15 +5,11 @@
       <!-- 第一个 tab - 通用参数 -->
       <el-tab-pane label="通用参数" name="tab1">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
+
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="是否显示试题编号">
-                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-
               <!-- 是否使用监考密码验证 -->
-              <!-- <el-form-item label="是否使用监考密码验证">
+            <el-form-item label="是否使用监考密码验证">
             <el-switch 
               v-model="form.isExamPassword" 
               active-value="0" 
@@ -21,67 +17,14 @@
               active-text="是" 
               inactive-text="否" 
               @change="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item> 
 
               <!-- 监考密码 -->
-              <!-- <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
+              <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
             <el-input v-model="form.examPassword" placeholder="请输入监考密码" @input="handleFormChange" />
-          </el-form-item> -->
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示试卷编号">
-                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否显示解析按钮">
-                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示重答按钮">
-                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-
-            </el-col>
-            <!-- <el-col :span="12">
-          <el-form-item label="考生答题时是否显示试题编号">
-            <el-switch 
-              v-model="form.isAnswerId" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
           </el-form-item>
-      </el-col> -->
-          </el-row>
-
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否启用考场设置">
-                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-
-
-            <el-col :span="12">
-              <el-form-item label="是否显示答案按钮">
-                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-
+           </el-col>
+             <el-col :span="12">
               <!-- 练习成绩保存 -->
               <el-form-item label="练习成绩保存">
                 <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
@@ -105,26 +48,69 @@
         </el-col> -->
 
 
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+
+              <el-form-item label="考生答题时是否显示试题编号">
+                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示试卷编号">
+                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否显示解析按钮">
+                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示重答按钮">
+                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否启用考场设置">
+                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="是否显示答案按钮">
+                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+
             <el-col :span="12">
               <el-form-item label="是否有测评时长限制">
                 <el-switch v-model="form.isTime" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
                   @change="handleFormChange" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <!-- <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
-        </el-col> -->
-
             <el-col :span="12">
               <el-form-item label="测评时长">
                 <el-time-picker v-model="form.examTime" value-format="HH:mm:ss" placeholder="请设置测评时长" class="ele-fluid"
@@ -145,17 +131,31 @@
           </el-form-item>
         </el-col> -->
           </el-row>
-
-
           <el-row :gutter="20">
 
 
+
+          <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="是否显示成绩">
+                <el-switch v-model="form.isScore" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
+              <el-form-item label="是否显示成绩明细">
+                <el-switch v-model="form.isScoreDetail" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+
               <!-- <el-form-item label="定时检查与学生端联通性，每">
             <el-input-number v-model="form.isConnect"  label="分钟" @change="handleFormChange" />
             <span>分钟传一次,断联直接交卷</span>
           </el-form-item> -->
-            </el-col>
+          
           </el-row>
 
 
@@ -236,6 +236,14 @@
             </el-col>
           </el-row>
 
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否允许复制题干">
+                <el-switch v-model="form.isCpoy" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="考试注意事项提醒" name="tab4">
@@ -271,7 +279,7 @@ const form = ref({
   driver: '',             // 存放系统盘
   directory: '',          // 考试目录名称
   uploadTime: '',         // 上传间隔时间
-  isDel: '',
+  isCpoy: '',
   isRepeat: '',           // 是否删除目录
   isAnswer: '',
   isLook: '',
@@ -279,7 +287,9 @@ const form = ref({
   isFile: '',
   isNet: '',
   isScreen: '',
-  warn: ''
+  warn: '',
+  isScore:'',
+  isScoreDetail:'',
 })
 
 const activeTab = ref('tab1')
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step5/components/person-edit.vue b/src/views/task/selftrans/collegeexam/components/steps/step5/components/person-edit.vue
index 3c57ff3..8b0dcd7 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step5/components/person-edit.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step5/components/person-edit.vue
@@ -187,7 +187,7 @@ const removeBatch = async () => {
   }
 
   await ElMessageBox.confirm(
-    '确定要删除选中的人员吗？',
+    '只能删除待考状态的学生,是否确认删除？',
     '警告',
     {
       confirmButtonText: '确定',
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step5/index.vue b/src/views/task/selftrans/collegeexam/components/steps/step5/index.vue
index b002c0b..99ee397 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step5/index.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step5/index.vue
@@ -196,7 +196,15 @@ const handleDeletes = async () => {
     message.error('请至少选择一条数据');
     return;
   }
-
+  await ElMessageBox.confirm(
+    '只能删除待考状态的学生,是否确认删除？',
+    '警告',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  );
   selectedRows.value = rows.map((d: any) => d.id); // 保存选中的行数据
 
   const deleteData = {
diff --git a/src/views/task/selftrans/module/components/steps/step1/components/step-edit.vue b/src/views/task/selftrans/module/components/steps/step1/components/step-edit.vue
index 091ff8d..71db1fc 100644
--- a/src/views/task/selftrans/module/components/steps/step1/components/step-edit.vue
+++ b/src/views/task/selftrans/module/components/steps/step1/components/step-edit.vue
@@ -43,9 +43,9 @@
       <el-form-item label="难度" prop="quLevel">
         <el-select v-model="form.quLevel" placeholder="请选择难度" :disabled="isUpdate">
           <el-option label="全部" :value="3" />
-          <el-option label="简单" :value="0" />
-          <el-option label="一般" :value="1" />
-          <el-option label="困难" :value="2" />
+          <el-option label="易" :value="0" />
+          <el-option label="中" :value="1" />
+          <el-option label="难" :value="2" />
         </el-select>
       </el-form-item>
 
@@ -347,7 +347,7 @@ const save = async () => {
     const fn = isUpdate.value ? updateScheme : addScheme
     await fn(payload)
     emit('done')
-    visible.value = false
+    // visible.value = false
   } finally {
     loading.value = false
   }
diff --git a/src/views/task/selftrans/module/components/steps/step2/components/step-add.vue b/src/views/task/selftrans/module/components/steps/step2/components/step-add.vue
index 7564d1c..6c12367 100644
--- a/src/views/task/selftrans/module/components/steps/step2/components/step-add.vue
+++ b/src/views/task/selftrans/module/components/steps/step2/components/step-add.vue
@@ -1,106 +1,388 @@
 <!-- 编辑弹窗 -->
 <template>
-<Dialog v-model="isVisible"    :title="'添加试卷'" width="460"    @open="handleOpen" center>
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        @submit.prevent=""
-      >
-        <el-form-item label="试卷数目" prop="num">
-          <el-input
-            clearable
-            v-model="form.num"
-            placeholder="请输入试卷数目"
-          />
-        </el-form-item>
-       
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" :loading="loading" @click="save">
-          保存
-        </el-button>
-      </template>
-    </Dialog>
-  </template>
-  <script setup>
-    import { ref, reactive, nextTick } from 'vue';
-  
-    import { useFormData } from '@/utils/use-form-data';
-    import { addPaper } from '@/api/system/paper';
-    const message = useMessage() // 消息弹窗
-    const props = defineProps({
-      /** 修改回显的数据 */
-      data: Object,
-      taskId: String ,
-      taskSpecialty: String,
-    });
-  
-    const emit = defineEmits(['done']);
-  
-    /** 弹窗是否打开 */
-    const isVisible = defineModel({ type: Boolean });
-  
-    /** 提交状态 */
-    const loading = ref(false);
-  
-    /** 表单实例 */
-    const formRef = ref(null);
-  
-    /** 表单数据 */
-    const [form, resetFields, assignFields] = useFormData({
-      num: '',
-      taskId: ''
-    });
-  
-    /** 表单验证规则 */
-    const rules = reactive({
-      num: [
-        { required: true, message: '请输入试卷数目', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
-      ]
-    });
+<Dialog v-model="isVisible" :title="'添加试卷'" width="460" @open="handleOpen" center>
+  <el-form
+    ref="formRef"
+    :model="form"
+    :rules="rules"
+    label-width="80px"
+    @submit.prevent=""
+  >
+    <el-form-item label="试卷数目" prop="num">
+      <el-input
+        clearable
+        v-model="form.num"
+        placeholder="请输入试卷数目"
+      />
+    </el-form-item>
 
-    /** 关闭弹窗 */
-    const handleCancel = () => {
-      isVisible.value = false;
+    <!-- 是否启用组卷范围 -->
+    <el-form-item label=" " label-width="0">
+      <div style="display: flex; align-items: center; gap: 10px;">
+        <el-checkbox v-model="form.useCustomScope">
+          自定义组卷范围
+        </el-checkbox>
+        <el-button v-if="form.useCustomScope" @click="handleScopeSetting">
+          组卷范围
+        </el-button>
+      </div>
+    </el-form-item>
+
+
+
+  </el-form>
+
+  <template #footer>
+    <el-button @click="handleCancel">取消</el-button>
+    <el-button type="primary" :loading="loading" @click="save">
+      保存
+    </el-button>
+  </template>
+</Dialog>
+
+
+
+<el-dialog v-model="scopeDialogVisible" title="设置组卷范围" width="80%">
+  <div style="display: flex;">
+    <!-- 左侧 -->
+    <div style="width: 40%; padding-right: 16px;">
+        <el-form-item label="分组类型">
+          <el-select v-model="selectedGroupType" placeholder="请选择" @change="loadLeftList">
+            <el-option label="练习" value="0" />
+            <el-option label="考试" value="1" />
+            <el-option label="冲刺练习" value="3" />
+          </el-select>
+        </el-form-item>
+
+    <el-tree
+      :data="leftTreeData"
+      node-key="id"
+      :props="{ label: 'label', children: 'children' }"
+       @node-click="handleNodeClick"
+    />
+
+    </div>
+
+    <!-- 右侧 -->
+    <div style="width: 60%; padding-left: 16px;">
+      <div style="font-weight: bold; margin-bottom: 8px;">已选试卷</div>
+     
+
+      <el-table
+        :data="rightList"
+        border
+        height="340"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="taskName" label="任务名称" align="center"/>
+        <el-table-column label="任务分组" align="center">
+          <template #default="{ row }">
+            {{ getTaskTypeLabel(row.taskType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="试卷编号" align="center" />
+       <el-table-column prop="que" label="题型" align="center"/>
+        <el-table-column width="160" label="操作" align="center">
+          <template #default="{ row }">
+            <el-button type="text" size="small" @click="removeFromRightList(row)">移除</el-button>
+            <el-button type="text" size="small" @click="openQueDialog(row)">设置题型</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+
+  <!-- 弹窗底部按钮 -->
+  <template #footer>
+    <el-button @click="scopeDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="handleScopeConfirm">确认</el-button>
+  </template>
+</el-dialog>
+<el-dialog v-model="queDialogVisible" title="选择题型" width="400px" center>
+  <el-checkbox
+    v-model="checkAll"
+    @change="handleCheckAllChange"
+    style="margin-bottom: 10px;"
+  >
+    题型名称
+  </el-checkbox>
+
+  <el-checkbox-group v-model="selectedQue" style="display: flex; flex-direction: column; gap: 8px;">
+    <el-checkbox
+      v-for="item in currentSpNames"
+      :key="item"
+      :label="item"
+    >{{ item }}</el-checkbox>
+  </el-checkbox-group>
+
+  <template #footer>
+    <el-button @click="queDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="confirmQue">确定</el-button>
+  </template>
+</el-dialog>
+
+
+</template>
+<script setup lang="ts">
+import { ref, reactive, nextTick } from 'vue';
+import * as SmsChannelApi from '@/api/system/task/index';
+import { useFormData } from '@/utils/use-form-data';
+import { addPaper ,addPaperBypaper} from '@/api/system/paper';
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  /** 修改回显的数据 */
+  data: Object,
+  taskId: String ,
+  taskSpecialty: String,
+});
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  signature: undefined,
+  status: undefined,
+  taskName:undefined,
+  createTime: [],
+  taskType:'3'
+})
+const emit = defineEmits(['done']);
+
+/** 弹窗是否打开 */
+const isVisible = defineModel({ type: Boolean });
+
+/** 提交状态 */
+const loading = ref(false);
+
+/** 表单实例 */
+const formRef = ref(null);
+
+/** 表单数据 */
+const [form, resetFields, assignFields] = useFormData({
+  num: '',
+  taskId: ''
+});
+
+/** 表单验证规则 */
+const rules = reactive({
+  num: [
+    { required: true, message: '请输入试卷数目', trigger: 'blur' },
+    { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
+  ]
+});
+
+    //组卷范围
+const scopeDialogVisible = ref(false);
+const queDialogVisible = ref(false);
+ 
+const selectedGroupType = ref('');
+const leftList = ref([]);
+const rightList = ref([]);
+const leftTreeData = ref([]);
+
+
+// 选中某个分组类型时，加载左侧列表
+const loadLeftList = async () => {
+  // 示例：根据 selectedGroupType 获取数据
+  queryParams.taskType=selectedGroupType.value
+  const res = await SmsChannelApi.pageTaskPapers(queryParams)
+  leftTreeData.value = convertToTreeData(res.list);
+};
+
+// 双击左侧行，加入右侧列表
+const handleRowDblClick = (row) => {
+  if (!rightList.value.find((r) => r.id === row.id)) {
+    rightList.value.push({ ...row });
+  }
+};
+
+// 从右侧列表中移除
+const removeFromRightList = (row) => {
+  rightList.value = rightList.value.filter((item) => item.id !== row.id);
+};
+
+// 点击确认
+const handleScopeConfirm = () => {
+  scopeDialogVisible.value = false;
+  // 提交 rightList.value 到后台或保存状态
+  console.log('选中的试卷：', rightList.value);
+};
+
+const handleScopeSetting = () => {
+  scopeDialogVisible.value = true;
+};
+
+
+
+const convertToTreeData = (taskList) => {
+  return taskList.map(task => {
+    return {
+      label: task.taskName,
+      children: (task.educationPaperList || []).map(paper => ({
+        label: paper.num || '未命名试卷',
+        id: paper.paperId,
+        num:paper.num,
+        taskName: task.taskName,
+        taskType: task.taskType,
+        que: '全部' ,
+        educationPaperSchemeList:task.educationPaperSchemeList
+      }))
     };
-  
-    /** 保存编辑 */
-    const save = () => {
-  formRef.value?.validate?.((valid) => {
-    if (!valid) {
-      return;
-    }
-    loading.value = true;
-    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
-      .then((msg) => {
-        loading.value = false;
-        message.success(msg);
-        handleCancel();
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
   });
 };
+const handleNodeClick = (data) => {
+  if (!data.children) {
+    // 是试卷节点
+    if (!rightList.value.find(p => p.id === data.id)) {
+      rightList.value.push(data);
+    }
+  }
+};
+const getTaskTypeLabel = (type) => {
+  const map = {
+    '0': '练习',
+    '1': '考试',
+    '3': '冲刺练习'
+  };
+  return map[type] || '未知';
+};
+
+const selectedRows = ref([]);
+const handleSelectionChange = (rows) => {
+  selectedRows.value = rows;
+};
+const checkAll = ref(false);
+const selectedQue = ref<string[]>([]);
+const currentSpNames = ref<Array<string>>([]); // 当前题型名列表
+const selectedRow = ref<any>(null); // 当前选中的试卷数据（可选）
+
+const openQueDialog = (row) => {
+
+  // 设置当前选中的题型列表
+  currentSpNames.value = row.educationPaperSchemeList?.map(item => item.spName) || [];
+
+  // 设置当前行（选中的试卷）用于后续保存
+  selectedRow.value = row;
+  queDialogVisible.value = true;
+};
+///
+
+watch(selectedQue, (val) => {
+  if (val.length === currentSpNames.value.length) {
+    checkAll.value = true;
+  } else {
+    checkAll.value = false;
+  }
+});
+
+const handleCheckAllChange = (val: boolean) => {
+  if (val) {
+    selectedQue.value = [...currentSpNames.value];
+  } else {
+    selectedQue.value = [];
+  }
+};
+
+
+
+// 确认选择题型，把逗号分隔字符串赋给该行que字段
+const confirmQue = async () => {
+  if (selectedRow.value) {
+    try {
+      const payload = {
+        taskId: props.taskId,
+        que: selectedQue.value // 数组形式传递
+      };
+
+     const res= await SmsChannelApi.checkType(payload);
+
+      // 可选：赋值用于前端展示（逗号拼接）
+      selectedRow.value.que = selectedQue.value.join(',');
+
+      ElMessage.success('题型设置成功');
+    } catch (err) {
+      console.error(err);
+      ElMessage.error('题型设置失败');
+    }
+  }
+
+  // 关闭弹窗 & 清空数据
+  queDialogVisible.value = false;
+  selectedRow.value = null;
+  selectedQue.value = [];
+  checkAll.value = false;
+};
+
+
+
+
+
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    isVisible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+formRef.value?.validate?.((valid) => {
+  if (!valid) {
+    return;
+  }
+  loading.value = true;
+  if (form.useCustomScope) {
+    console.log( form.num+"num")
+    console.log(rightList.value+"rightList.value")
+
+      if (!rightList.value || rightList.value.length === 0) {
+        ElMessage.warning('请先设置组卷范围！');
+        return; // 阻止后续逻辑
+      }
+    console.log( props.taskId)
+    const payload = {
+      num: form.num,
+      taskId: props.taskId,
+      paperList: rightList.value, // 如果是数组，字段名建议有“List”或“Array”
+    };
+    addPaperBypaper(payload)
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    console.log("自定义范围!");
+    }else{
+    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    }
+
+});
+};
 
   
-    /** 弹窗打开事件 */
-    const handleOpen = () => {
-        resetFields();
-        form.taskId = props.taskId; // 新增时赋值 taskId
-        form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
-      nextTick(() => {
-        nextTick(() => {
-          formRef.value?.clearValidate?.();
-        });
-      });
-    };
-    defineExpose({ open })
-  </script>
-  
\ No newline at end of file
+/** 弹窗打开事件 */
+const handleOpen = () => {
+    resetFields();
+    form.taskId = props.taskId; // 新增时赋值 taskId
+    form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
+  nextTick(() => {
+    nextTick(() => {
+      formRef.value?.clearValidate?.();
+    });
+  });
+};
+defineExpose({ open })
+</script>
diff --git a/src/views/task/selftrans/module/components/steps/step2/index copy.vue b/src/views/task/selftrans/module/components/steps/step2/index copy.vue
deleted file mode 100644
index 1755b28..0000000
--- a/src/views/task/selftrans/module/components/steps/step2/index copy.vue	
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-
-  <ContentWrap>
-     <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-     
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:sms-channel:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增</el-button
-        >
-      </el-form-item>
-    </el-form> 
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="试卷编号" align="center" prop="paperId" />
-      <el-table-column label="使用次数" align="center" prop="counts" />
-      <el-table-column label="抽卷方式" align="center" prop="rollUp">
-        <template #default="scope">
-        <span v-if="scope.row.quLevel === '0'">固定</span>
-        <span v-else-if="scope.row.quLevel === '1'">AB卷</span>
-        <span v-else-if="scope.row.quLevel === '2'">随机</span>
-        <span v-else-if="scope.row.quLevel === '3'">自选</span>
-        <span v-else>未知</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="AB卷" align="center" prop="isAb">
-        <template #default="scope">
-        <span v-if="scope.row.quLevel === '0'">A卷</span>
-        <span v-else-if="scope.row.quLevel === '1'">B卷</span>
-        <span v-else>未知</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="status" >
-      <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.status" />
-        </template>
-    </el-table-column>
-      
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openEdit('update', scope.row)"
-            v-hasPermi="['system:sms-channel:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:sms-channel:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-
-
-
-<paper-add  v-model="showAdd"  :task-Id="taskId" :task-specialty="taskSpecialty"   />
-    <paper-edit v-model="showEdit" :data="current" />
-    <!-- <paper-look v-model="showLook" :paper-id="paperId"  /> -->
-    <paper-set  v-model="showSet"  :task-Id="taskId"  />
-</template>
-<script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-
-import * as SmsChannelApi from '@/api/system/paper';
-import PaperEdit from './components/step-edit.vue';
-  import PaperAdd from './components/step-add.vue';
-  import PaperLook from './components/step-look.vue';
-  import PaperSet from './components/step-set.vue';
-  import PaperSearch from './components/step-search.vue';
-  import { pagePapers, removePapers, exportPapers } from '@/api/system/paper';
-
-
-
-defineOptions({ name: 'SystemPaper' });
-  const props = defineProps({
-    taskSpecialty: {
-    type: String,
-    default: ''
-  },
-  taskId: {
-    type: String,
-    default: ''
-  }
-})
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-
-  /** 当前编辑数据 */
-  const current = ref<object>();
-
-  /** 是否显示编辑弹窗 */
-  const showEdit = ref(false);
-
-  const showLook = ref(false);
-
-  const showAdd = ref(false);
-
-  const showSet = ref(false);
-  
-
-const smsChannelFormRef = ref()
-const taskEditRef = ref()
-const taskAddRef = ref()
-const taskTempRef = ref()
-
-
-
-const loading = ref(false) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 列表的数据
-const queryFormRef = ref() // 搜索的表单
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  signature: undefined,
-  status: undefined,
-  createTime: []
-})
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const res = await SmsChannelApi.pagePapers(queryParams)
-    console.log(res)
-    list.value = res
-    total.value = res.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref();
-const openForm = (type: string, id?: number) => {
-  showAdd.value = true
-  taskAddRef.value?.open(type, id)
-}
-
-const openEdit = (type: string, row?: object) => {
-  showEdit.value = true
-  current.value = row
-  console.log( current.value )
-  taskEditRef.value?.open(type, row)
-}
-
-
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SmsChannelApi.removePaper(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
diff --git a/src/views/task/selftrans/module/components/steps/step2/index.vue b/src/views/task/selftrans/module/components/steps/step2/index.vue
index 86b670c..09e3112 100644
--- a/src/views/task/selftrans/module/components/steps/step2/index.vue
+++ b/src/views/task/selftrans/module/components/steps/step2/index.vue
@@ -54,7 +54,7 @@
           plain
           @click="openSet"
         >
-          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷调整
+          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷方式
         </el-button>
          <el-button
           type="primary"
diff --git a/src/views/task/selftrans/module/components/steps/step3/index.vue b/src/views/task/selftrans/module/components/steps/step3/index.vue
index 38bb263..54d33d2 100644
--- a/src/views/task/selftrans/module/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/module/components/steps/step3/index.vue
@@ -5,20 +5,11 @@
       <!-- 第一个 tab - 通用参数 -->
       <el-tab-pane label="通用参数" name="tab1">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
+
           <el-row :gutter="20">
             <el-col :span="12">
-
-          <el-form-item label="是否显示试题编号">
-            <el-switch 
-              v-model="form.isAnswerId" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-          <!-- 是否使用监考密码验证 -->
-          <!-- <el-form-item label="是否使用监考密码验证">
+              <!-- 是否使用监考密码验证 -->
+            <el-form-item label="是否使用监考密码验证">
             <el-switch 
               v-model="form.isExamPassword" 
               active-value="0" 
@@ -26,154 +17,109 @@
               active-text="是" 
               inactive-text="否" 
               @change="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item> 
 
-          <!-- 监考密码 -->
-          <!-- <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
+              <!-- 监考密码 -->
+              <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
             <el-input v-model="form.examPassword" placeholder="请输入监考密码" @input="handleFormChange" />
-          </el-form-item> -->
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否显示试卷编号">
-            <el-switch 
-              v-model="form.isNumber" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="是否显示解析按钮">
-            <el-switch 
-              v-model="form.isContent" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否显示重答按钮">
-            <el-switch 
-              v-model="form.isRepeat" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-
-        </el-col>
-        <!-- <el-col :span="12">
-          <el-form-item label="考生答题时是否显示试题编号">
-            <el-switch 
-              v-model="form.isAnswerId" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-      </el-col> -->
-      </el-row>
-
-
-       <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="是否启用考场设置">
-            <el-switch 
-              v-model="form.isSession" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-        </el-col>
-        
-    
-    <el-col :span="12">
-          <el-form-item label="是否显示答案按钮">
-            <el-switch 
-              v-model="form.isAnswer" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-            </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-
-          <!-- 练习成绩保存 -->
-          <el-form-item label="练习成绩保存">
-            <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
-              <el-radio label="0">最高成绩</el-radio>
-              <el-radio label="1">最新成绩</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-    
-        <!-- <el-col :span="12">
-          <el-form-item label="是否显示重答按钮">
-            <el-switch 
-              v-model="form.isRepeat" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-
-        </el-col> -->
-
-
+           </el-col>
              <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <!-- <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
+              <!-- 练习成绩保存 -->
+              <el-form-item label="练习成绩保存">
+                <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
+                  <el-radio label="0">最高成绩</el-radio>
+                  <el-radio label="1">最新成绩</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <!-- <el-col :span="12">
+          <el-form-item label="是否显示重答按钮">
+            <el-switch 
+              v-model="form.isRepeat" 
+              active-value="0" 
+              inactive-value="1" 
+              active-text="是" 
+              inactive-text="否" 
+              @change="handleFormChange" />
+          </el-form-item>
+
         </el-col> -->
 
-      <el-col :span="12">
-        <el-form-item label="测评时长" >
-          <el-time-picker
-            v-model="form.examTime"
-            value-format="HH:mm:ss"
-            placeholder="请设置测评时长"
-            class="ele-fluid"
-            @change="handleFormChange"
-          />
-        </el-form-item>
+
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+
+              <el-form-item label="考生答题时是否显示试题编号">
+                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示试卷编号">
+                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否显示解析按钮">
+                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示重答按钮">
+                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否启用考场设置">
+                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
             </el-col>
 
 
-              <!-- <el-col :span="12">
+            <el-col :span="12">
+              <el-form-item label="是否显示答案按钮">
+                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+
+            <el-col :span="12">
+              <el-form-item label="是否有测评时长限制">
+                <el-switch v-model="form.isTime" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="测评时长">
+                <el-time-picker v-model="form.examTime" value-format="HH:mm:ss" placeholder="请设置测评时长" class="ele-fluid"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+            <!-- <el-col :span="12">
           <el-form-item label="学生是否可以查看试卷">
             <el-switch 
               v-model="form.isLook" 
@@ -184,20 +130,34 @@
               @change="handleFormChange" />
           </el-form-item>
         </el-col> -->
-      </el-row>
+          </el-row>
+          <el-row :gutter="20">
 
 
-      <el-row :gutter="20">
 
-  
           <el-col :span="12">
-          <!-- <el-form-item label="定时检查与学生端联通性，每">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="是否显示成绩">
+                <el-switch v-model="form.isScore" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示成绩明细">
+                <el-switch v-model="form.isScoreDetail" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+
+              <!-- <el-form-item label="定时检查与学生端联通性，每">
             <el-input-number v-model="form.isConnect"  label="分钟" @change="handleFormChange" />
             <span>分钟传一次,断联直接交卷</span>
           </el-form-item> -->
-          </el-col>
-      </el-row>
-        
+          
+          </el-row>
+
 
         </el-form>
       </el-tab-pane>
@@ -237,70 +197,58 @@
 
 
 
-            
 
-       <el-tab-pane label="防作弊功能" name="tab3">
+
+      <el-tab-pane label="防作弊功能" name="tab3">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
-    
-
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <!-- 禁止学生使用U盘 -->
-          <el-form-item label="禁止学生使用U盘">
-            <el-switch 
-              v-model="form.usb" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否可以文件共享">
-            <el-switch 
-              v-model="form.isFile" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-        </el-col>
-      </el-row>
 
 
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <!-- 禁止学生使用U盘 -->
-          <el-form-item label="禁用外网">
-            <el-switch 
-              v-model="form.isNet" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="禁止截屏">
-            <el-switch 
-              v-model="form.isScreen" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-        
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="禁止学生使用U盘">
+                <el-switch v-model="form.usb" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否可以文件共享">
+                <el-switch v-model="form.isFile" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="禁用外网">
+                <el-switch v-model="form.isNet" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="禁止截屏">
+                <el-switch v-model="form.isScreen" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否允许复制题干">
+                <el-switch v-model="form.isCpoy" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
-       <el-tab-pane label="考试注意事项提醒" name="tab4">
+      <el-tab-pane label="考试注意事项提醒" name="tab4">
         <div class="block" @blur.capture="handleFormChange">
-          <Editor v-model="form.warn" height="250px"      />
+          <Editor v-model="form.warn" height="250px" />
         </div>
       </el-tab-pane>
 
@@ -321,9 +269,9 @@ const props = defineProps({
 
 // 字段初始值设置为空或空字符串
 const form = ref({
-  isAnswerId:'',
-  isContent:'',
-  isNumber:'',
+  isAnswerId: '',
+  isContent: '',
+  isNumber: '',
   isExamPassword: '',     // 是否使用监考密码验证
   examPassword: '',       // 监考密码
   usb: '',                // 是否禁止U盘
@@ -331,15 +279,17 @@ const form = ref({
   driver: '',             // 存放系统盘
   directory: '',          // 考试目录名称
   uploadTime: '',         // 上传间隔时间
-  isDel: '',   
-  isRepeat:'',           // 是否删除目录
-  isAnswer:'',
-  isLook:'',
-  isConnect:'',
-  isFile:'',
-  isNet:'',
-  isScreen:'',
-  warn:''
+  isCpoy: '',
+  isRepeat: '',           // 是否删除目录
+  isAnswer: '',
+  isLook: '',
+  isConnect: '',
+  isFile: '',
+  isNet: '',
+  isScreen: '',
+  warn: '',
+  isScore:'',
+  isScoreDetail:'',
 })
 
 const activeTab = ref('tab1')
diff --git a/src/views/task/selftrans/module/components/steps/step5/components/person-edit.vue b/src/views/task/selftrans/module/components/steps/step5/components/person-edit.vue
index 3c57ff3..65ea440 100644
--- a/src/views/task/selftrans/module/components/steps/step5/components/person-edit.vue
+++ b/src/views/task/selftrans/module/components/steps/step5/components/person-edit.vue
@@ -148,6 +148,7 @@ const openAssignDialog = () => {
     ElMessage.warning('请先选择左侧任务！');
     return;
   }
+  
   showPersonEdit.value = true;
   nextTick(() => {
     stuAddRef.value?.open();
@@ -187,7 +188,7 @@ const removeBatch = async () => {
   }
 
   await ElMessageBox.confirm(
-    '确定要删除选中的人员吗？',
+    '只能删除待考状态的学生,是否确认删除？',
     '警告',
     {
       confirmButtonText: '确定',
diff --git a/src/views/task/selftrans/module/components/steps/step5/index.vue b/src/views/task/selftrans/module/components/steps/step5/index.vue
index b002c0b..99ee397 100644
--- a/src/views/task/selftrans/module/components/steps/step5/index.vue
+++ b/src/views/task/selftrans/module/components/steps/step5/index.vue
@@ -196,7 +196,15 @@ const handleDeletes = async () => {
     message.error('请至少选择一条数据');
     return;
   }
-
+  await ElMessageBox.confirm(
+    '只能删除待考状态的学生,是否确认删除？',
+    '警告',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  );
   selectedRows.value = rows.map((d: any) => d.id); // 保存选中的行数据
 
   const deleteData = {
diff --git a/src/views/task/selftrans/random/components/steps/step1/components/step-edit.vue b/src/views/task/selftrans/random/components/steps/step1/components/step-edit.vue
index 145548f..7479690 100644
--- a/src/views/task/selftrans/random/components/steps/step1/components/step-edit.vue
+++ b/src/views/task/selftrans/random/components/steps/step1/components/step-edit.vue
@@ -43,9 +43,9 @@
       <el-form-item label="难度" prop="quLevel">
         <el-select v-model="form.quLevel" placeholder="请选择难度" :disabled="isUpdate">
           <el-option label="全部" :value="3" />
-          <el-option label="简单" :value="0" />
-          <el-option label="一般" :value="1" />
-          <el-option label="困难" :value="2" />
+          <el-option label="易" :value="0" />
+          <el-option label="中" :value="1" />
+          <el-option label="难" :value="2" />
         </el-select>
       </el-form-item>
 
@@ -345,7 +345,7 @@ const save = async () => {
     const fn = isUpdate.value ? updateScheme : addScheme
     await fn(payload)
     emit('done')
-    visible.value = false
+    // visible.value = false
   } finally {
     loading.value = false
   }
diff --git a/src/views/task/selftrans/random/components/steps/step2/components/step-add.vue b/src/views/task/selftrans/random/components/steps/step2/components/step-add.vue
index 7564d1c..6c12367 100644
--- a/src/views/task/selftrans/random/components/steps/step2/components/step-add.vue
+++ b/src/views/task/selftrans/random/components/steps/step2/components/step-add.vue
@@ -1,106 +1,388 @@
 <!-- 编辑弹窗 -->
 <template>
-<Dialog v-model="isVisible"    :title="'添加试卷'" width="460"    @open="handleOpen" center>
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        @submit.prevent=""
-      >
-        <el-form-item label="试卷数目" prop="num">
-          <el-input
-            clearable
-            v-model="form.num"
-            placeholder="请输入试卷数目"
-          />
-        </el-form-item>
-       
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" :loading="loading" @click="save">
-          保存
-        </el-button>
-      </template>
-    </Dialog>
-  </template>
-  <script setup>
-    import { ref, reactive, nextTick } from 'vue';
-  
-    import { useFormData } from '@/utils/use-form-data';
-    import { addPaper } from '@/api/system/paper';
-    const message = useMessage() // 消息弹窗
-    const props = defineProps({
-      /** 修改回显的数据 */
-      data: Object,
-      taskId: String ,
-      taskSpecialty: String,
-    });
-  
-    const emit = defineEmits(['done']);
-  
-    /** 弹窗是否打开 */
-    const isVisible = defineModel({ type: Boolean });
-  
-    /** 提交状态 */
-    const loading = ref(false);
-  
-    /** 表单实例 */
-    const formRef = ref(null);
-  
-    /** 表单数据 */
-    const [form, resetFields, assignFields] = useFormData({
-      num: '',
-      taskId: ''
-    });
-  
-    /** 表单验证规则 */
-    const rules = reactive({
-      num: [
-        { required: true, message: '请输入试卷数目', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
-      ]
-    });
+<Dialog v-model="isVisible" :title="'添加试卷'" width="460" @open="handleOpen" center>
+  <el-form
+    ref="formRef"
+    :model="form"
+    :rules="rules"
+    label-width="80px"
+    @submit.prevent=""
+  >
+    <el-form-item label="试卷数目" prop="num">
+      <el-input
+        clearable
+        v-model="form.num"
+        placeholder="请输入试卷数目"
+      />
+    </el-form-item>
 
-    /** 关闭弹窗 */
-    const handleCancel = () => {
-      isVisible.value = false;
+    <!-- 是否启用组卷范围 -->
+    <el-form-item label=" " label-width="0">
+      <div style="display: flex; align-items: center; gap: 10px;">
+        <el-checkbox v-model="form.useCustomScope">
+          自定义组卷范围
+        </el-checkbox>
+        <el-button v-if="form.useCustomScope" @click="handleScopeSetting">
+          组卷范围
+        </el-button>
+      </div>
+    </el-form-item>
+
+
+
+  </el-form>
+
+  <template #footer>
+    <el-button @click="handleCancel">取消</el-button>
+    <el-button type="primary" :loading="loading" @click="save">
+      保存
+    </el-button>
+  </template>
+</Dialog>
+
+
+
+<el-dialog v-model="scopeDialogVisible" title="设置组卷范围" width="80%">
+  <div style="display: flex;">
+    <!-- 左侧 -->
+    <div style="width: 40%; padding-right: 16px;">
+        <el-form-item label="分组类型">
+          <el-select v-model="selectedGroupType" placeholder="请选择" @change="loadLeftList">
+            <el-option label="练习" value="0" />
+            <el-option label="考试" value="1" />
+            <el-option label="冲刺练习" value="3" />
+          </el-select>
+        </el-form-item>
+
+    <el-tree
+      :data="leftTreeData"
+      node-key="id"
+      :props="{ label: 'label', children: 'children' }"
+       @node-click="handleNodeClick"
+    />
+
+    </div>
+
+    <!-- 右侧 -->
+    <div style="width: 60%; padding-left: 16px;">
+      <div style="font-weight: bold; margin-bottom: 8px;">已选试卷</div>
+     
+
+      <el-table
+        :data="rightList"
+        border
+        height="340"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="taskName" label="任务名称" align="center"/>
+        <el-table-column label="任务分组" align="center">
+          <template #default="{ row }">
+            {{ getTaskTypeLabel(row.taskType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="试卷编号" align="center" />
+       <el-table-column prop="que" label="题型" align="center"/>
+        <el-table-column width="160" label="操作" align="center">
+          <template #default="{ row }">
+            <el-button type="text" size="small" @click="removeFromRightList(row)">移除</el-button>
+            <el-button type="text" size="small" @click="openQueDialog(row)">设置题型</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+
+  <!-- 弹窗底部按钮 -->
+  <template #footer>
+    <el-button @click="scopeDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="handleScopeConfirm">确认</el-button>
+  </template>
+</el-dialog>
+<el-dialog v-model="queDialogVisible" title="选择题型" width="400px" center>
+  <el-checkbox
+    v-model="checkAll"
+    @change="handleCheckAllChange"
+    style="margin-bottom: 10px;"
+  >
+    题型名称
+  </el-checkbox>
+
+  <el-checkbox-group v-model="selectedQue" style="display: flex; flex-direction: column; gap: 8px;">
+    <el-checkbox
+      v-for="item in currentSpNames"
+      :key="item"
+      :label="item"
+    >{{ item }}</el-checkbox>
+  </el-checkbox-group>
+
+  <template #footer>
+    <el-button @click="queDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="confirmQue">确定</el-button>
+  </template>
+</el-dialog>
+
+
+</template>
+<script setup lang="ts">
+import { ref, reactive, nextTick } from 'vue';
+import * as SmsChannelApi from '@/api/system/task/index';
+import { useFormData } from '@/utils/use-form-data';
+import { addPaper ,addPaperBypaper} from '@/api/system/paper';
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  /** 修改回显的数据 */
+  data: Object,
+  taskId: String ,
+  taskSpecialty: String,
+});
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  signature: undefined,
+  status: undefined,
+  taskName:undefined,
+  createTime: [],
+  taskType:'3'
+})
+const emit = defineEmits(['done']);
+
+/** 弹窗是否打开 */
+const isVisible = defineModel({ type: Boolean });
+
+/** 提交状态 */
+const loading = ref(false);
+
+/** 表单实例 */
+const formRef = ref(null);
+
+/** 表单数据 */
+const [form, resetFields, assignFields] = useFormData({
+  num: '',
+  taskId: ''
+});
+
+/** 表单验证规则 */
+const rules = reactive({
+  num: [
+    { required: true, message: '请输入试卷数目', trigger: 'blur' },
+    { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
+  ]
+});
+
+    //组卷范围
+const scopeDialogVisible = ref(false);
+const queDialogVisible = ref(false);
+ 
+const selectedGroupType = ref('');
+const leftList = ref([]);
+const rightList = ref([]);
+const leftTreeData = ref([]);
+
+
+// 选中某个分组类型时，加载左侧列表
+const loadLeftList = async () => {
+  // 示例：根据 selectedGroupType 获取数据
+  queryParams.taskType=selectedGroupType.value
+  const res = await SmsChannelApi.pageTaskPapers(queryParams)
+  leftTreeData.value = convertToTreeData(res.list);
+};
+
+// 双击左侧行，加入右侧列表
+const handleRowDblClick = (row) => {
+  if (!rightList.value.find((r) => r.id === row.id)) {
+    rightList.value.push({ ...row });
+  }
+};
+
+// 从右侧列表中移除
+const removeFromRightList = (row) => {
+  rightList.value = rightList.value.filter((item) => item.id !== row.id);
+};
+
+// 点击确认
+const handleScopeConfirm = () => {
+  scopeDialogVisible.value = false;
+  // 提交 rightList.value 到后台或保存状态
+  console.log('选中的试卷：', rightList.value);
+};
+
+const handleScopeSetting = () => {
+  scopeDialogVisible.value = true;
+};
+
+
+
+const convertToTreeData = (taskList) => {
+  return taskList.map(task => {
+    return {
+      label: task.taskName,
+      children: (task.educationPaperList || []).map(paper => ({
+        label: paper.num || '未命名试卷',
+        id: paper.paperId,
+        num:paper.num,
+        taskName: task.taskName,
+        taskType: task.taskType,
+        que: '全部' ,
+        educationPaperSchemeList:task.educationPaperSchemeList
+      }))
     };
-  
-    /** 保存编辑 */
-    const save = () => {
-  formRef.value?.validate?.((valid) => {
-    if (!valid) {
-      return;
-    }
-    loading.value = true;
-    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
-      .then((msg) => {
-        loading.value = false;
-        message.success(msg);
-        handleCancel();
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
   });
 };
+const handleNodeClick = (data) => {
+  if (!data.children) {
+    // 是试卷节点
+    if (!rightList.value.find(p => p.id === data.id)) {
+      rightList.value.push(data);
+    }
+  }
+};
+const getTaskTypeLabel = (type) => {
+  const map = {
+    '0': '练习',
+    '1': '考试',
+    '3': '冲刺练习'
+  };
+  return map[type] || '未知';
+};
+
+const selectedRows = ref([]);
+const handleSelectionChange = (rows) => {
+  selectedRows.value = rows;
+};
+const checkAll = ref(false);
+const selectedQue = ref<string[]>([]);
+const currentSpNames = ref<Array<string>>([]); // 当前题型名列表
+const selectedRow = ref<any>(null); // 当前选中的试卷数据（可选）
+
+const openQueDialog = (row) => {
+
+  // 设置当前选中的题型列表
+  currentSpNames.value = row.educationPaperSchemeList?.map(item => item.spName) || [];
+
+  // 设置当前行（选中的试卷）用于后续保存
+  selectedRow.value = row;
+  queDialogVisible.value = true;
+};
+///
+
+watch(selectedQue, (val) => {
+  if (val.length === currentSpNames.value.length) {
+    checkAll.value = true;
+  } else {
+    checkAll.value = false;
+  }
+});
+
+const handleCheckAllChange = (val: boolean) => {
+  if (val) {
+    selectedQue.value = [...currentSpNames.value];
+  } else {
+    selectedQue.value = [];
+  }
+};
+
+
+
+// 确认选择题型，把逗号分隔字符串赋给该行que字段
+const confirmQue = async () => {
+  if (selectedRow.value) {
+    try {
+      const payload = {
+        taskId: props.taskId,
+        que: selectedQue.value // 数组形式传递
+      };
+
+     const res= await SmsChannelApi.checkType(payload);
+
+      // 可选：赋值用于前端展示（逗号拼接）
+      selectedRow.value.que = selectedQue.value.join(',');
+
+      ElMessage.success('题型设置成功');
+    } catch (err) {
+      console.error(err);
+      ElMessage.error('题型设置失败');
+    }
+  }
+
+  // 关闭弹窗 & 清空数据
+  queDialogVisible.value = false;
+  selectedRow.value = null;
+  selectedQue.value = [];
+  checkAll.value = false;
+};
+
+
+
+
+
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    isVisible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+formRef.value?.validate?.((valid) => {
+  if (!valid) {
+    return;
+  }
+  loading.value = true;
+  if (form.useCustomScope) {
+    console.log( form.num+"num")
+    console.log(rightList.value+"rightList.value")
+
+      if (!rightList.value || rightList.value.length === 0) {
+        ElMessage.warning('请先设置组卷范围！');
+        return; // 阻止后续逻辑
+      }
+    console.log( props.taskId)
+    const payload = {
+      num: form.num,
+      taskId: props.taskId,
+      paperList: rightList.value, // 如果是数组，字段名建议有“List”或“Array”
+    };
+    addPaperBypaper(payload)
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    console.log("自定义范围!");
+    }else{
+    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    }
+
+});
+};
 
   
-    /** 弹窗打开事件 */
-    const handleOpen = () => {
-        resetFields();
-        form.taskId = props.taskId; // 新增时赋值 taskId
-        form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
-      nextTick(() => {
-        nextTick(() => {
-          formRef.value?.clearValidate?.();
-        });
-      });
-    };
-    defineExpose({ open })
-  </script>
-  
\ No newline at end of file
+/** 弹窗打开事件 */
+const handleOpen = () => {
+    resetFields();
+    form.taskId = props.taskId; // 新增时赋值 taskId
+    form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
+  nextTick(() => {
+    nextTick(() => {
+      formRef.value?.clearValidate?.();
+    });
+  });
+};
+defineExpose({ open })
+</script>
diff --git a/src/views/task/selftrans/random/components/steps/step2/index copy.vue b/src/views/task/selftrans/random/components/steps/step2/index copy.vue
deleted file mode 100644
index 1755b28..0000000
--- a/src/views/task/selftrans/random/components/steps/step2/index copy.vue	
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-
-  <ContentWrap>
-     <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-     
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['system:sms-channel:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增</el-button
-        >
-      </el-form-item>
-    </el-form> 
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="试卷编号" align="center" prop="paperId" />
-      <el-table-column label="使用次数" align="center" prop="counts" />
-      <el-table-column label="抽卷方式" align="center" prop="rollUp">
-        <template #default="scope">
-        <span v-if="scope.row.quLevel === '0'">固定</span>
-        <span v-else-if="scope.row.quLevel === '1'">AB卷</span>
-        <span v-else-if="scope.row.quLevel === '2'">随机</span>
-        <span v-else-if="scope.row.quLevel === '3'">自选</span>
-        <span v-else>未知</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="AB卷" align="center" prop="isAb">
-        <template #default="scope">
-        <span v-if="scope.row.quLevel === '0'">A卷</span>
-        <span v-else-if="scope.row.quLevel === '1'">B卷</span>
-        <span v-else>未知</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="status" >
-      <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.status" />
-        </template>
-    </el-table-column>
-      
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openEdit('update', scope.row)"
-            v-hasPermi="['system:sms-channel:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:sms-channel:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-
-
-
-<paper-add  v-model="showAdd"  :task-Id="taskId" :task-specialty="taskSpecialty"   />
-    <paper-edit v-model="showEdit" :data="current" />
-    <!-- <paper-look v-model="showLook" :paper-id="paperId"  /> -->
-    <paper-set  v-model="showSet"  :task-Id="taskId"  />
-</template>
-<script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-
-import * as SmsChannelApi from '@/api/system/paper';
-import PaperEdit from './components/step-edit.vue';
-  import PaperAdd from './components/step-add.vue';
-  import PaperLook from './components/step-look.vue';
-  import PaperSet from './components/step-set.vue';
-  import PaperSearch from './components/step-search.vue';
-  import { pagePapers, removePapers, exportPapers } from '@/api/system/paper';
-
-
-
-defineOptions({ name: 'SystemPaper' });
-  const props = defineProps({
-    taskSpecialty: {
-    type: String,
-    default: ''
-  },
-  taskId: {
-    type: String,
-    default: ''
-  }
-})
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-
-  /** 当前编辑数据 */
-  const current = ref<object>();
-
-  /** 是否显示编辑弹窗 */
-  const showEdit = ref(false);
-
-  const showLook = ref(false);
-
-  const showAdd = ref(false);
-
-  const showSet = ref(false);
-  
-
-const smsChannelFormRef = ref()
-const taskEditRef = ref()
-const taskAddRef = ref()
-const taskTempRef = ref()
-
-
-
-const loading = ref(false) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 列表的数据
-const queryFormRef = ref() // 搜索的表单
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  signature: undefined,
-  status: undefined,
-  createTime: []
-})
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const res = await SmsChannelApi.pagePapers(queryParams)
-    console.log(res)
-    list.value = res
-    total.value = res.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref();
-const openForm = (type: string, id?: number) => {
-  showAdd.value = true
-  taskAddRef.value?.open(type, id)
-}
-
-const openEdit = (type: string, row?: object) => {
-  showEdit.value = true
-  current.value = row
-  console.log( current.value )
-  taskEditRef.value?.open(type, row)
-}
-
-
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SmsChannelApi.removePaper(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
diff --git a/src/views/task/selftrans/random/components/steps/step2/index.vue b/src/views/task/selftrans/random/components/steps/step2/index.vue
index 86b670c..e8efe40 100644
--- a/src/views/task/selftrans/random/components/steps/step2/index.vue
+++ b/src/views/task/selftrans/random/components/steps/step2/index.vue
@@ -54,7 +54,7 @@
           plain
           @click="openSet"
         >
-          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷调整
+          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷方式
         </el-button>
          <el-button
           type="primary"
@@ -129,7 +129,7 @@
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.paperId)"
+            @click="handleDelete(scope.row)"
             v-hasPermi="['system:sms-channel:delete']"
           >
             删除
@@ -325,10 +325,14 @@ const openLook = (type: string, paperId?: number) => {
 
 
 // 删除操作
-const handleDelete = async (id: number) => {
+const handleDelete = async (row?: any) => {
+    if (row?.counts > 0) {
+      ElMessage.warning('当前试卷使用次数大于0，不允许删除！');
+      return; 
+    }
   try {
     await message.delConfirm();
-    await PaperApi.removePaper(id);
+    await PaperApi.removePaper(row.paperId);
     message.success(t('common.delSuccess'));
     await getList();
   } catch (error) {
diff --git a/src/views/task/selftrans/random/components/steps/step3/index.vue b/src/views/task/selftrans/random/components/steps/step3/index.vue
index 4378383..54d33d2 100644
--- a/src/views/task/selftrans/random/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/random/components/steps/step3/index.vue
@@ -5,15 +5,11 @@
       <!-- 第一个 tab - 通用参数 -->
       <el-tab-pane label="通用参数" name="tab1">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
+
           <el-row :gutter="20">
             <el-col :span="12">
-
-              <el-form-item label="是否显示试题编号">
-                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
               <!-- 是否使用监考密码验证 -->
-              <!-- <el-form-item label="是否使用监考密码验证">
+            <el-form-item label="是否使用监考密码验证">
             <el-switch 
               v-model="form.isExamPassword" 
               active-value="0" 
@@ -21,67 +17,14 @@
               active-text="是" 
               inactive-text="否" 
               @change="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item> 
 
               <!-- 监考密码 -->
-              <!-- <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
+              <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
             <el-input v-model="form.examPassword" placeholder="请输入监考密码" @input="handleFormChange" />
-          </el-form-item> -->
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示试卷编号">
-                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否显示解析按钮">
-                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示重答按钮">
-                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-
-            </el-col>
-            <!-- <el-col :span="12">
-          <el-form-item label="考生答题时是否显示试题编号">
-            <el-switch 
-              v-model="form.isAnswerId" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
           </el-form-item>
-      </el-col> -->
-          </el-row>
-
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否启用考场设置">
-                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-
-
-            <el-col :span="12">
-              <el-form-item label="是否显示答案按钮">
-                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-
+           </el-col>
+             <el-col :span="12">
               <!-- 练习成绩保存 -->
               <el-form-item label="练习成绩保存">
                 <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
@@ -105,26 +48,69 @@
         </el-col> -->
 
 
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+
+              <el-form-item label="考生答题时是否显示试题编号">
+                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示试卷编号">
+                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否显示解析按钮">
+                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示重答按钮">
+                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否启用考场设置">
+                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="是否显示答案按钮">
+                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+
             <el-col :span="12">
               <el-form-item label="是否有测评时长限制">
                 <el-switch v-model="form.isTime" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
                   @change="handleFormChange" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <!-- <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
-        </el-col> -->
-
             <el-col :span="12">
               <el-form-item label="测评时长">
                 <el-time-picker v-model="form.examTime" value-format="HH:mm:ss" placeholder="请设置测评时长" class="ele-fluid"
@@ -145,17 +131,31 @@
           </el-form-item>
         </el-col> -->
           </el-row>
-
-
           <el-row :gutter="20">
 
 
+
+          <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="是否显示成绩">
+                <el-switch v-model="form.isScore" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
+              <el-form-item label="是否显示成绩明细">
+                <el-switch v-model="form.isScoreDetail" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+
               <!-- <el-form-item label="定时检查与学生端联通性，每">
             <el-input-number v-model="form.isConnect"  label="分钟" @change="handleFormChange" />
             <span>分钟传一次,断联直接交卷</span>
           </el-form-item> -->
-            </el-col>
+          
           </el-row>
 
 
@@ -236,6 +236,14 @@
             </el-col>
           </el-row>
 
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否允许复制题干">
+                <el-switch v-model="form.isCpoy" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="考试注意事项提醒" name="tab4">
@@ -271,7 +279,7 @@ const form = ref({
   driver: '',             // 存放系统盘
   directory: '',          // 考试目录名称
   uploadTime: '',         // 上传间隔时间
-  isDel: '',
+  isCpoy: '',
   isRepeat: '',           // 是否删除目录
   isAnswer: '',
   isLook: '',
@@ -279,7 +287,9 @@ const form = ref({
   isFile: '',
   isNet: '',
   isScreen: '',
-  warn: ''
+  warn: '',
+  isScore:'',
+  isScoreDetail:'',
 })
 
 const activeTab = ref('tab1')
diff --git a/src/views/task/selftrans/random/components/steps/step5/components/person-edit.vue b/src/views/task/selftrans/random/components/steps/step5/components/person-edit.vue
index 3c57ff3..8b0dcd7 100644
--- a/src/views/task/selftrans/random/components/steps/step5/components/person-edit.vue
+++ b/src/views/task/selftrans/random/components/steps/step5/components/person-edit.vue
@@ -187,7 +187,7 @@ const removeBatch = async () => {
   }
 
   await ElMessageBox.confirm(
-    '确定要删除选中的人员吗？',
+    '只能删除待考状态的学生,是否确认删除？',
     '警告',
     {
       confirmButtonText: '确定',
diff --git a/src/views/task/selftrans/random/components/steps/step5/index.vue b/src/views/task/selftrans/random/components/steps/step5/index.vue
index b002c0b..99ee397 100644
--- a/src/views/task/selftrans/random/components/steps/step5/index.vue
+++ b/src/views/task/selftrans/random/components/steps/step5/index.vue
@@ -196,7 +196,15 @@ const handleDeletes = async () => {
     message.error('请至少选择一条数据');
     return;
   }
-
+  await ElMessageBox.confirm(
+    '只能删除待考状态的学生,是否确认删除？',
+    '警告',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  );
   selectedRows.value = rows.map((d: any) => d.id); // 保存选中的行数据
 
   const deleteData = {
diff --git a/src/views/task/sprint/components/steps/step1/components/step-edit.vue b/src/views/task/sprint/components/steps/step1/components/step-edit.vue
index 22efd3c..db38616 100644
--- a/src/views/task/sprint/components/steps/step1/components/step-edit.vue
+++ b/src/views/task/sprint/components/steps/step1/components/step-edit.vue
@@ -43,9 +43,9 @@
       <el-form-item label="难度" prop="quLevel">
         <el-select v-model="form.quLevel" placeholder="请选择难度" :disabled="isUpdate">
           <el-option label="全部" :value="3" />
-          <el-option label="简单" :value="0" />
-          <el-option label="一般" :value="1" />
-          <el-option label="困难" :value="2" />
+          <el-option label="易" :value="0" />
+          <el-option label="中" :value="1" />
+          <el-option label="难" :value="2" />
         </el-select>
       </el-form-item>
 
@@ -87,9 +87,9 @@
       </el-form-item>
 
 
-      <el-form-item label="别名排序" prop="sort">
+      <!-- <el-form-item label="别名排序" prop="sort">
         <el-input-number v-model="form.sort"  />
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <template #footer>
diff --git a/src/views/task/sprint/components/steps/step2/components/step-add.vue b/src/views/task/sprint/components/steps/step2/components/step-add.vue
index 3004318..2279f51 100644
--- a/src/views/task/sprint/components/steps/step2/components/step-add.vue
+++ b/src/views/task/sprint/components/steps/step2/components/step-add.vue
@@ -1,106 +1,399 @@
 <!-- 编辑弹窗 -->
 <template>
-<Dialog v-model="isVisible"    :title="'添加试卷'" width="460"    @open="handleOpen" center>
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        @submit.prevent=""
-      >
-        <el-form-item label="试卷数目" prop="num">
-          <el-input
-            clearable
-            v-model="form.num"
-            placeholder="请输入试卷数目"
-          />
-        </el-form-item>
-       
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" :loading="loading" @click="save">
-          保存
-        </el-button>
-      </template>
-    </Dialog>
-  </template>
-  <script setup>
-    import { ref, reactive, nextTick } from 'vue';
-  
-    import { useFormData } from '@/utils/use-form-data';
-    import { addPaper } from '@/api/system/paper';
-    const message = useMessage() // 消息弹窗
-    const props = defineProps({
-      /** 修改回显的数据 */
-      data: Object,
-      taskId: String ,
-      taskSpecialty: String,
-    });
-  
-    const emit = defineEmits(['done']);
-  
-    /** 弹窗是否打开 */
-    const isVisible = defineModel({ type: Boolean });
-  
-    /** 提交状态 */
-    const loading = ref(false);
-  
-    /** 表单实例 */
-    const formRef = ref(null);
-  
-    /** 表单数据 */
-    const [form, resetFields, assignFields] = useFormData({
-      num: '',
-      taskId: ''
-    });
-  
-    /** 表单验证规则 */
-    const rules = reactive({
-      num: [
-        { required: true, message: '请输入试卷数目', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
-      ]
-    });
+<Dialog v-model="isVisible" :title="'添加试卷'" width="460" @open="handleOpen" center>
+  <el-form
+    ref="formRef"
+    :model="form"
+    :rules="rules"
+    label-width="80px"
+    @submit.prevent=""
+  >
+    <el-form-item label="试卷数目" prop="num">
+      <el-input
+        clearable
+        v-model="form.num"
+        placeholder="请输入试卷数目"
+      />
+    </el-form-item>
 
-    /** 关闭弹窗 */
-    const handleCancel = () => {
-      isVisible.value = false;
+    <!-- 是否启用组卷范围 -->
+    <el-form-item label=" " label-width="0">
+      <div style="display: flex; align-items: center; gap: 10px;">
+        <el-checkbox v-model="form.useCustomScope">
+          自定义组卷范围
+        </el-checkbox>
+        <el-button v-if="form.useCustomScope" @click="handleScopeSetting">
+          组卷范围
+        </el-button>
+      </div>
+    </el-form-item>
+
+
+
+  </el-form>
+
+  <template #footer>
+    <el-button @click="handleCancel">取消</el-button>
+    <el-button type="primary" :loading="loading" @click="save">
+      保存
+    </el-button>
+  </template>
+</Dialog>
+
+
+
+<el-dialog v-model="scopeDialogVisible" title="设置组卷范围" width="80%" @closed="handleDialogClose">
+  <div style="display: flex;">
+    <!-- 左侧 -->
+    <div style="width: 40%; padding-right: 16px;">
+        <el-form-item label="分组类型">
+          <el-select v-model="selectedGroupType" placeholder="请选择" @change="loadLeftList">
+            <el-option label="练习" value="0" />
+            <el-option label="考试" value="1" />
+            <el-option label="冲刺练习" value="3" />
+          </el-select>
+        </el-form-item>
+
+    <el-tree
+      :data="leftTreeData"
+      node-key="id"
+      :props="{ label: 'label', children: 'children' }"
+       @node-click="handleNodeClick"
+    />
+
+    </div>
+
+    <!-- 右侧 -->
+    <div style="width: 60%; padding-left: 16px;">
+      <div style="font-weight: bold; margin-bottom: 8px;">已选试卷</div>
+     
+
+      <el-table
+        :data="rightList"
+        border
+        height="340"
+        :fit="true"
+      >
+        <el-table-column prop="taskName" label="任务名称" align="center"/>
+        <el-table-column label="任务分组" align="center">
+          <template #default="{ row }">
+            {{ getTaskTypeLabel(row.taskType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="试卷编号" align="center" />
+       <el-table-column prop="que"   label="题型"  align="center"   />
+        <el-table-column width="160" label="操作" align="center">
+          <template #default="{ row }">
+            <el-button type="text" size="small" @click="removeFromRightList(row)">移除</el-button>
+            <el-button type="text" size="small" @click="openQueDialog(row)">设置题型</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+
+  <!-- 弹窗底部按钮 -->
+  <template #footer>
+    <el-button @click="onCancel">取消</el-button>
+    <el-button type="primary" @click="handleScopeConfirm">确认</el-button>
+  </template>
+</el-dialog>
+<el-dialog v-model="queDialogVisible" title="选择题型" width="400px" center>
+  <el-checkbox
+    v-model="checkAll"
+    @change="handleCheckAllChange"
+    style="margin-bottom: 10px;"
+  >
+    题型名称
+  </el-checkbox>
+
+  <el-checkbox-group v-model="selectedQue" style="display: flex; flex-direction: column; gap: 8px;">
+    <el-checkbox
+      v-for="item in currentSpNames"
+      :key="item"
+      :label="item"
+    >{{ item }}</el-checkbox>
+  </el-checkbox-group>
+
+  <template #footer>
+    <el-button @click="queDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="confirmQue">确定</el-button>
+  </template>
+</el-dialog>
+
+
+</template>
+<script setup lang="ts">
+import { ref, reactive, nextTick } from 'vue';
+import * as SmsChannelApi from '@/api/system/task/index';
+import { useFormData } from '@/utils/use-form-data';
+import { addPaper ,addPaperBypaper} from '@/api/system/paper';
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  /** 修改回显的数据 */
+  data: Object,
+  taskId: String ,
+  taskSpecialty: String,
+});
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  signature: undefined,
+  status: undefined,
+  taskName:undefined,
+  createTime: [],
+  taskType:'3'
+})
+const emit = defineEmits(['done']);
+
+/** 弹窗是否打开 */
+const isVisible = defineModel({ type: Boolean });
+
+/** 提交状态 */
+const loading = ref(false);
+
+/** 表单实例 */
+const formRef = ref(null);
+
+/** 表单数据 */
+const [form, resetFields, assignFields] = useFormData({
+  num: '',
+  taskId: ''
+});
+
+/** 表单验证规则 */
+const rules = reactive({
+  num: [
+    { required: true, message: '请输入试卷数目', trigger: 'blur' },
+    { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
+  ]
+});
+
+    //组卷范围
+const scopeDialogVisible = ref(false);
+let isConfirmClosing = false;
+const queDialogVisible = ref(false);
+ 
+const selectedGroupType = ref('');
+const leftList = ref([]);
+const rightList = ref([]);
+const leftTreeData = ref([]);
+
+
+// 选中某个分组类型时，加载左侧列表
+const loadLeftList = async () => {
+  // 示例：根据 selectedGroupType 获取数据
+  queryParams.taskType=selectedGroupType.value
+  const res = await SmsChannelApi.pageTaskPapers(queryParams)
+  leftTreeData.value = convertToTreeData(res.list);
+};
+
+
+// 从右侧列表中移除
+const removeFromRightList = (row) => {
+  rightList.value = rightList.value.filter((item) => item.id !== row.id);
+};
+
+// 点击确认
+const handleScopeConfirm = () => {
+   isConfirmClosing = true;
+  scopeDialogVisible.value = false;
+  // 提交 rightList.value 到后台或保存状态
+  console.log('选中的试卷：', rightList.value);
+};
+
+const handleScopeSetting = () => {
+  scopeDialogVisible.value = true;
+};
+
+
+
+const convertToTreeData = (taskList) => {
+  return taskList.map(task => {
+    return {
+      label: task.taskName,
+      children: (task.educationPaperList || []).map(paper => ({
+        label: paper.num || '未命名试卷',
+        id: paper.paperId,
+        num:paper.num,
+        taskName: task.taskName,
+        taskType: task.taskType,
+        que: '全部' ,
+        educationPaperSchemeList:task.educationPaperSchemeList
+      }))
     };
-  
-    /** 保存编辑 */
-    const save = () => {
-  formRef.value?.validate?.((valid) => {
-    if (!valid) {
-      return;
-    }
-    loading.value = true;
-    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
-      .then((msg) => {
-        loading.value = false;
-        message.success('新增成功！');
-        handleCancel();
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
   });
 };
+const handleNodeClick = (data) => {
+  if (!data.children) {
+    // 是试卷节点
+    if (!rightList.value.find(p => p.id === data.id)) {
+      rightList.value.push(data);
+    }
+  }
+};
+const getTaskTypeLabel = (type) => {
+  const map = {
+    '0': '练习',
+    '1': '考试',
+    '3': '冲刺练习'
+  };
+  return map[type] || '未知';
+};
+
+
+const handleDialogClose = () => {
+   if (!isConfirmClosing) {
+    selectedGroupType.value='',
+    rightList.value = [];
+    leftTreeData.value=[] // 只有不是确认才清空
+  }
+    isConfirmClosing = false; // 重置标志位
+}
+const onCancel = () => {
+  isConfirmClosing = false;
+  selectedGroupType.value='',
+  rightList.value = [];
+  leftTreeData.value=[]
+  scopeDialogVisible.value = false;
+};
+
+
+const checkAll = ref(false);
+const selectedQue = ref<string[]>([]);
+const currentSpNames = ref<Array<string>>([]); // 当前题型名列表
+const selectedRow = ref<any>(null); // 当前选中的试卷数据（可选）
+
+const openQueDialog = (row) => {
+
+  // 设置当前选中的题型列表
+  currentSpNames.value = row.educationPaperSchemeList?.map(item => item.spName) || [];
+
+  // 设置当前行（选中的试卷）用于后续保存
+  selectedRow.value = row;
+  queDialogVisible.value = true;
+};
+///
+
+watch(selectedQue, (val) => {
+  if (val.length === currentSpNames.value.length) {
+    checkAll.value = true;
+  } else {
+    checkAll.value = false;
+  }
+});
+
+const handleCheckAllChange = (val: boolean) => {
+  if (val) {
+    selectedQue.value = [...currentSpNames.value];
+  } else {
+    selectedQue.value = [];
+  }
+};
+
+
+
+// 确认选择题型，把逗号分隔字符串赋给该行que字段
+const confirmQue = async () => {
+  if (selectedRow.value) {
+    try {
+      const payload = {
+        taskId: props.taskId,
+        que: selectedQue.value // 数组形式传递
+      };
+
+     const res= await SmsChannelApi.checkType(payload);
+
+      // 可选：赋值用于前端展示（逗号拼接）
+      selectedRow.value.que = selectedQue.value.join(',');
+
+      ElMessage.success('题型设置成功');
+    } catch (err) {
+      console.error(err);
+      ElMessage.error('题型设置失败');
+    }
+  }
+
+  // 关闭弹窗 & 清空数据
+  queDialogVisible.value = false;
+  selectedRow.value = null;
+  selectedQue.value = [];
+  checkAll.value = false;
+};
+
+
+
+
+
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    isVisible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+formRef.value?.validate?.((valid) => {
+  if (!valid) {
+    return;
+  }
+  loading.value = true;
+  if (form.useCustomScope) {
+    console.log( form.num+"num")
+    console.log(rightList.value+"rightList.value")
+
+      if (!rightList.value || rightList.value.length === 0) {
+        ElMessage.warning('请先设置组卷范围！');
+        loading.value = false;
+        return; // 阻止后续逻辑
+      }
+    console.log( props.taskId)
+    const payload = {
+      num: form.num,
+      taskId: props.taskId,
+      paperList: rightList.value, // 如果是数组，字段名建议有“List”或“Array”
+    };
+    addPaperBypaper(payload)
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    console.log("自定义范围!");
+    }else{
+     console.log("不是自定义范围!");
+    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    }
+
+});
+};
 
   
-    /** 弹窗打开事件 */
-    const handleOpen = () => {
-        resetFields();
-        form.taskId = props.taskId; // 新增时赋值 taskId
-        form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
-      nextTick(() => {
-        nextTick(() => {
-          formRef.value?.clearValidate?.();
-        });
-      });
-    };
-    defineExpose({ open })
-  </script>
-  
\ No newline at end of file
+/** 弹窗打开事件 */
+const handleOpen = () => {
+    resetFields();
+    form.taskId = props.taskId; // 新增时赋值 taskId
+    form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
+  nextTick(() => {
+    nextTick(() => {
+      formRef.value?.clearValidate?.();
+    });
+  });
+};
+defineExpose({ open })
+</script>
diff --git a/src/views/task/sprint/components/steps/step2/components/step-edit.vue b/src/views/task/sprint/components/steps/step2/components/step-edit.vue
index b735684..1dcc3ca 100644
--- a/src/views/task/sprint/components/steps/step2/components/step-edit.vue
+++ b/src/views/task/sprint/components/steps/step2/components/step-edit.vue
@@ -22,7 +22,8 @@
           <dict-tag :type="DICT_TYPE.EXAM_QUE_DIFF" :value="scope.row.quLevel" />
         </template>
       </el-table-column>
-      <el-table-column label="知识点" prop="pointNames" align="left" />
+      <el-table-column label="章节" prop="pointNamesVo" align="left" />
+      <el-table-column label="知识点" prop="chapteridDictTextVo" align="left" />
   
     </el-table>
     </div>
@@ -172,14 +173,14 @@
 
 <Dialog v-model="visibleChange" :title="'换题列表'" width="80%" center  @close="handleCancelQue" >
   <ContentWrap>
-    <div style="display: flex; gap: 20px;height: 500px; width: 100%;">
+    <div style="display: flex; gap: 20px;height: 600px; width: 100%;">
 
       <!-- 左侧题目表格 -->
       <div style="flex: 3;">
 
                <!-- 搜索条件区域 -->
             <div style="margin-bottom: 16px; display: flex; gap: 12px; align-items: center; flex-wrap: wrap;">
-              <el-input
+              <!-- <el-input
                 v-model="queryParams.pointNames"
                 placeholder="试题知识点"
                 clearable
@@ -194,7 +195,7 @@
                 <el-option label="简单" value="0" />
                 <el-option label="一般" value="1" />
                 <el-option label="困难" value="2" />
-              </el-select>
+              </el-select> -->
               <el-input
                 v-model="queryParams.quNum"
                 placeholder="试题编号"
@@ -216,13 +217,13 @@
           <el-table-column label="试题编号" align="center"  prop="quNum" :show-overflow-tooltip="true"/>
           <el-table-column label="专业" align="center" prop="specialtyName" width="120" />
           <el-table-column label="课程" align="center" prop="courseName" :show-overflow-tooltip="true" />
-          <el-table-column label="章节名称" align="center" prop="chapteridDictText" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="章节名称" align="center" prop="chapteridDictText" :show-overflow-tooltip="true" /> -->
           <el-table-column label="难度" align="center" prop="quLevel" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.EXAM_QUE_DIFF" :value="scope.row.quLevel" />
             </template>
           </el-table-column>
-          <el-table-column label="知识点" align="center" prop="pointNames" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="知识点" align="center" prop="pointNames" :show-overflow-tooltip="true" /> -->
           <!-- <el-table-column label="审核状态" align="center" prop="audit" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.QUESTION_AUDIT" :value="scope.row.audit" />
@@ -521,6 +522,11 @@ const handleRowClick = (row: any) => {
 const getList = async () => {
   loading.value = true
 queryParams.subjectName=selectedQuestion.value.subjectName
+queryParams.pointNames=selectedQuestion.value.pointNames
+queryParams.chapteridDictText=selectedQuestion.value.chapteridDictText
+queryParams.quLevel=selectedQuestion.value.quLevel
+queryParams.specialtyName=selectedQuestion.value.specialtyName
+queryParams.courseName=selectedQuestion.value.courseName
   try {
     const data = await QuestionApi.getQuestionlistAnswer(queryParams);
     list.value = data.list
diff --git a/src/views/task/sprint/components/steps/step2/index.vue b/src/views/task/sprint/components/steps/step2/index.vue
index 5819ae6..f3aef2b 100644
--- a/src/views/task/sprint/components/steps/step2/index.vue
+++ b/src/views/task/sprint/components/steps/step2/index.vue
@@ -54,7 +54,7 @@
           plain
           @click="openSet"
         >
-          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷调整
+          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷方式
         </el-button>
       <el-button
         type="primary"
@@ -117,7 +117,6 @@
             link
             type="primary"
             @click="openLook('look', scope.row.paperId)"
-            v-hasPermi="['system:sms-channel:update']"
           >
             查看
           </el-button>
@@ -125,15 +124,13 @@
             link
             type="primary"
             @click="openEdit('update', scope.row)"
-            v-hasPermi="['system:sms-channel:update']"
           >
             编辑
           </el-button>
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.paperId)"
-            v-hasPermi="['system:sms-channel:delete']"
+            @click="handleDelete(scope.row)"
           >
             删除
           </el-button>
@@ -344,10 +341,14 @@ const openLook = (type: string, paperId?: number) => {
 
 
 // 删除操作
-const handleDelete = async (id: number) => {
+const handleDelete = async (row?: any) => {
+    if (row?.counts > 0) {
+    ElMessage.warning('当前试卷使用次数大于0，不允许删除！');
+    return; 
+  }
   try {
     await message.delConfirm();
-    await PaperApi.removePaper(id);
+    await PaperApi.removePaper(row.paperId);
     message.success(t('common.delSuccess'));
     await getList();
   } catch (error) {
diff --git a/src/views/task/sprint/components/steps/step3/index.vue b/src/views/task/sprint/components/steps/step3/index.vue
index 912ccfa..38c6bdf 100644
--- a/src/views/task/sprint/components/steps/step3/index.vue
+++ b/src/views/task/sprint/components/steps/step3/index.vue
@@ -5,15 +5,11 @@
       <!-- 第一个 tab - 通用参数 -->
       <el-tab-pane label="通用参数" name="tab1">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
+
           <el-row :gutter="20">
             <el-col :span="12">
-
-              <el-form-item label="考生答题时是否显示试题编号">
-                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
               <!-- 是否使用监考密码验证 -->
-              <!-- <el-form-item label="是否使用监考密码验证">
+            <el-form-item label="是否使用监考密码验证">
             <el-switch 
               v-model="form.isExamPassword" 
               active-value="0" 
@@ -21,67 +17,14 @@
               active-text="是" 
               inactive-text="否" 
               @change="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item> 
 
               <!-- 监考密码 -->
-              <!-- <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
+              <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
             <el-input v-model="form.examPassword" placeholder="请输入监考密码" @input="handleFormChange" />
-          </el-form-item> -->
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示试卷编号">
-                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否显示解析按钮">
-                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否显示重答按钮">
-                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-
-            </el-col>
-            <!-- <el-col :span="12">
-          <el-form-item label="考生答题时是否显示试题编号">
-            <el-switch 
-              v-model="form.isAnswerId" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
           </el-form-item>
-      </el-col> -->
-          </el-row>
-
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否启用考场设置">
-                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-
-
-            <el-col :span="12">
-              <el-form-item label="是否显示答案按钮">
-                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
-                  @change="handleFormChange" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-
+           </el-col>
+             <el-col :span="12">
               <!-- 练习成绩保存 -->
               <el-form-item label="练习成绩保存">
                 <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
@@ -105,26 +48,69 @@
         </el-col> -->
 
 
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+
+              <el-form-item label="考生答题时是否显示试题编号">
+                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示试卷编号">
+                <el-switch v-model="form.isNumber" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否显示解析按钮">
+                <el-switch v-model="form.isContent" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示重答按钮">
+                <el-switch v-model="form.isRepeat" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+
+            </el-col>
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否启用考场设置">
+                <el-switch v-model="form.isSession" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="是否显示答案按钮">
+                <el-switch v-model="form.isAnswer" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+
             <el-col :span="12">
               <el-form-item label="是否有测评时长限制">
                 <el-switch v-model="form.isTime" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
                   @change="handleFormChange" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <!-- <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
-        </el-col> -->
-
             <el-col :span="12">
               <el-form-item label="测评时长">
                 <el-time-picker v-model="form.examTime" value-format="HH:mm:ss" placeholder="请设置测评时长" class="ele-fluid"
@@ -145,17 +131,31 @@
           </el-form-item>
         </el-col> -->
           </el-row>
-
-
           <el-row :gutter="20">
 
 
+
+          <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="是否显示成绩">
+                <el-switch v-model="form.isScore" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
+              <el-form-item label="是否显示成绩明细">
+                <el-switch v-model="form.isScoreDetail" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+
               <!-- <el-form-item label="定时检查与学生端联通性，每">
             <el-input-number v-model="form.isConnect"  label="分钟" @change="handleFormChange" />
             <span>分钟传一次,断联直接交卷</span>
           </el-form-item> -->
-            </el-col>
+          
           </el-row>
 
 
@@ -236,6 +236,15 @@
             </el-col>
           </el-row>
 
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否允许复制题干">
+                <el-switch v-model="form.isCpoy" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="考试注意事项提醒" name="tab4">
@@ -271,7 +280,7 @@ const form = ref({
   driver: '',             // 存放系统盘
   directory: '',          // 考试目录名称
   uploadTime: '',         // 上传间隔时间
-  isDel: '',
+  isCpoy: '',
   isRepeat: '',           // 是否删除目录
   isAnswer: '',
   isLook: '',
@@ -279,7 +288,9 @@ const form = ref({
   isFile: '',
   isNet: '',
   isScreen: '',
-  warn: ''
+  warn: '',
+  isScore:'',
+  isScoreDetail:'',
 })
 
 const activeTab = ref('tab1')
diff --git a/src/views/task/sprint/components/steps/step5/components/person-edit.vue b/src/views/task/sprint/components/steps/step5/components/person-edit.vue
index 3c57ff3..8b0dcd7 100644
--- a/src/views/task/sprint/components/steps/step5/components/person-edit.vue
+++ b/src/views/task/sprint/components/steps/step5/components/person-edit.vue
@@ -187,7 +187,7 @@ const removeBatch = async () => {
   }
 
   await ElMessageBox.confirm(
-    '确定要删除选中的人员吗？',
+    '只能删除待考状态的学生,是否确认删除？',
     '警告',
     {
       confirmButtonText: '确定',
diff --git a/src/views/task/sprint/components/steps/step5/index.vue b/src/views/task/sprint/components/steps/step5/index.vue
index b002c0b..e80cdc4 100644
--- a/src/views/task/sprint/components/steps/step5/index.vue
+++ b/src/views/task/sprint/components/steps/step5/index.vue
@@ -191,12 +191,21 @@ const selectedRows = ref<string[]>([]);
 
 const handleDeletes = async () => {
   try {
-    const rows = selections.value;
+  
+  const rows = selections.value;
   if (!rows.length) {
     message.error('请至少选择一条数据');
     return;
   }
-
+    await ElMessageBox.confirm(
+      '只能删除待考状态的学生,是否确认删除？',
+      '警告',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    );
   selectedRows.value = rows.map((d: any) => d.id); // 保存选中的行数据
 
   const deleteData = {
diff --git a/src/views/task/trans/components/steps/step1/components/step-edit.vue b/src/views/task/trans/components/steps/step1/components/step-edit.vue
index 81d8465..c8ff863 100644
--- a/src/views/task/trans/components/steps/step1/components/step-edit.vue
+++ b/src/views/task/trans/components/steps/step1/components/step-edit.vue
@@ -43,9 +43,9 @@
       <el-form-item label="难度" prop="quLevel">
         <el-select v-model="form.quLevel" placeholder="请选择难度" :disabled="isUpdate">
           <el-option label="全部" :value="3" />
-          <el-option label="简单" :value="0" />
-          <el-option label="一般" :value="1" />
-          <el-option label="困难" :value="2" />
+          <el-option label="易" :value="0" />
+          <el-option label="中" :value="1" />
+          <el-option label="难" :value="2" />
         </el-select>
       </el-form-item>
 
@@ -346,7 +346,7 @@ const save = async () => {
     const fn = isUpdate.value ? updateScheme : addScheme
     await fn(payload)
     emit('done')
-    visible.value = false
+    // visible.value = false
   } finally {
     loading.value = false
   }
diff --git a/src/views/task/trans/components/steps/step2/components/step-add.vue b/src/views/task/trans/components/steps/step2/components/step-add.vue
index 3004318..2279f51 100644
--- a/src/views/task/trans/components/steps/step2/components/step-add.vue
+++ b/src/views/task/trans/components/steps/step2/components/step-add.vue
@@ -1,106 +1,399 @@
 <!-- 编辑弹窗 -->
 <template>
-<Dialog v-model="isVisible"    :title="'添加试卷'" width="460"    @open="handleOpen" center>
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        @submit.prevent=""
-      >
-        <el-form-item label="试卷数目" prop="num">
-          <el-input
-            clearable
-            v-model="form.num"
-            placeholder="请输入试卷数目"
-          />
-        </el-form-item>
-       
-      </el-form>
-      <template #footer>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" :loading="loading" @click="save">
-          保存
-        </el-button>
-      </template>
-    </Dialog>
-  </template>
-  <script setup>
-    import { ref, reactive, nextTick } from 'vue';
-  
-    import { useFormData } from '@/utils/use-form-data';
-    import { addPaper } from '@/api/system/paper';
-    const message = useMessage() // 消息弹窗
-    const props = defineProps({
-      /** 修改回显的数据 */
-      data: Object,
-      taskId: String ,
-      taskSpecialty: String,
-    });
-  
-    const emit = defineEmits(['done']);
-  
-    /** 弹窗是否打开 */
-    const isVisible = defineModel({ type: Boolean });
-  
-    /** 提交状态 */
-    const loading = ref(false);
-  
-    /** 表单实例 */
-    const formRef = ref(null);
-  
-    /** 表单数据 */
-    const [form, resetFields, assignFields] = useFormData({
-      num: '',
-      taskId: ''
-    });
-  
-    /** 表单验证规则 */
-    const rules = reactive({
-      num: [
-        { required: true, message: '请输入试卷数目', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
-      ]
-    });
+<Dialog v-model="isVisible" :title="'添加试卷'" width="460" @open="handleOpen" center>
+  <el-form
+    ref="formRef"
+    :model="form"
+    :rules="rules"
+    label-width="80px"
+    @submit.prevent=""
+  >
+    <el-form-item label="试卷数目" prop="num">
+      <el-input
+        clearable
+        v-model="form.num"
+        placeholder="请输入试卷数目"
+      />
+    </el-form-item>
 
-    /** 关闭弹窗 */
-    const handleCancel = () => {
-      isVisible.value = false;
+    <!-- 是否启用组卷范围 -->
+    <el-form-item label=" " label-width="0">
+      <div style="display: flex; align-items: center; gap: 10px;">
+        <el-checkbox v-model="form.useCustomScope">
+          自定义组卷范围
+        </el-checkbox>
+        <el-button v-if="form.useCustomScope" @click="handleScopeSetting">
+          组卷范围
+        </el-button>
+      </div>
+    </el-form-item>
+
+
+
+  </el-form>
+
+  <template #footer>
+    <el-button @click="handleCancel">取消</el-button>
+    <el-button type="primary" :loading="loading" @click="save">
+      保存
+    </el-button>
+  </template>
+</Dialog>
+
+
+
+<el-dialog v-model="scopeDialogVisible" title="设置组卷范围" width="80%" @closed="handleDialogClose">
+  <div style="display: flex;">
+    <!-- 左侧 -->
+    <div style="width: 40%; padding-right: 16px;">
+        <el-form-item label="分组类型">
+          <el-select v-model="selectedGroupType" placeholder="请选择" @change="loadLeftList">
+            <el-option label="练习" value="0" />
+            <el-option label="考试" value="1" />
+            <el-option label="冲刺练习" value="3" />
+          </el-select>
+        </el-form-item>
+
+    <el-tree
+      :data="leftTreeData"
+      node-key="id"
+      :props="{ label: 'label', children: 'children' }"
+       @node-click="handleNodeClick"
+    />
+
+    </div>
+
+    <!-- 右侧 -->
+    <div style="width: 60%; padding-left: 16px;">
+      <div style="font-weight: bold; margin-bottom: 8px;">已选试卷</div>
+     
+
+      <el-table
+        :data="rightList"
+        border
+        height="340"
+        :fit="true"
+      >
+        <el-table-column prop="taskName" label="任务名称" align="center"/>
+        <el-table-column label="任务分组" align="center">
+          <template #default="{ row }">
+            {{ getTaskTypeLabel(row.taskType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="num" label="试卷编号" align="center" />
+       <el-table-column prop="que"   label="题型"  align="center"   />
+        <el-table-column width="160" label="操作" align="center">
+          <template #default="{ row }">
+            <el-button type="text" size="small" @click="removeFromRightList(row)">移除</el-button>
+            <el-button type="text" size="small" @click="openQueDialog(row)">设置题型</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+
+  <!-- 弹窗底部按钮 -->
+  <template #footer>
+    <el-button @click="onCancel">取消</el-button>
+    <el-button type="primary" @click="handleScopeConfirm">确认</el-button>
+  </template>
+</el-dialog>
+<el-dialog v-model="queDialogVisible" title="选择题型" width="400px" center>
+  <el-checkbox
+    v-model="checkAll"
+    @change="handleCheckAllChange"
+    style="margin-bottom: 10px;"
+  >
+    题型名称
+  </el-checkbox>
+
+  <el-checkbox-group v-model="selectedQue" style="display: flex; flex-direction: column; gap: 8px;">
+    <el-checkbox
+      v-for="item in currentSpNames"
+      :key="item"
+      :label="item"
+    >{{ item }}</el-checkbox>
+  </el-checkbox-group>
+
+  <template #footer>
+    <el-button @click="queDialogVisible = false">取消</el-button>
+    <el-button type="primary" @click="confirmQue">确定</el-button>
+  </template>
+</el-dialog>
+
+
+</template>
+<script setup lang="ts">
+import { ref, reactive, nextTick } from 'vue';
+import * as SmsChannelApi from '@/api/system/task/index';
+import { useFormData } from '@/utils/use-form-data';
+import { addPaper ,addPaperBypaper} from '@/api/system/paper';
+const message = useMessage() // 消息弹窗
+const props = defineProps({
+  /** 修改回显的数据 */
+  data: Object,
+  taskId: String ,
+  taskSpecialty: String,
+});
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  signature: undefined,
+  status: undefined,
+  taskName:undefined,
+  createTime: [],
+  taskType:'3'
+})
+const emit = defineEmits(['done']);
+
+/** 弹窗是否打开 */
+const isVisible = defineModel({ type: Boolean });
+
+/** 提交状态 */
+const loading = ref(false);
+
+/** 表单实例 */
+const formRef = ref(null);
+
+/** 表单数据 */
+const [form, resetFields, assignFields] = useFormData({
+  num: '',
+  taskId: ''
+});
+
+/** 表单验证规则 */
+const rules = reactive({
+  num: [
+    { required: true, message: '请输入试卷数目', trigger: 'blur' },
+    { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' }
+  ]
+});
+
+    //组卷范围
+const scopeDialogVisible = ref(false);
+let isConfirmClosing = false;
+const queDialogVisible = ref(false);
+ 
+const selectedGroupType = ref('');
+const leftList = ref([]);
+const rightList = ref([]);
+const leftTreeData = ref([]);
+
+
+// 选中某个分组类型时，加载左侧列表
+const loadLeftList = async () => {
+  // 示例：根据 selectedGroupType 获取数据
+  queryParams.taskType=selectedGroupType.value
+  const res = await SmsChannelApi.pageTaskPapers(queryParams)
+  leftTreeData.value = convertToTreeData(res.list);
+};
+
+
+// 从右侧列表中移除
+const removeFromRightList = (row) => {
+  rightList.value = rightList.value.filter((item) => item.id !== row.id);
+};
+
+// 点击确认
+const handleScopeConfirm = () => {
+   isConfirmClosing = true;
+  scopeDialogVisible.value = false;
+  // 提交 rightList.value 到后台或保存状态
+  console.log('选中的试卷：', rightList.value);
+};
+
+const handleScopeSetting = () => {
+  scopeDialogVisible.value = true;
+};
+
+
+
+const convertToTreeData = (taskList) => {
+  return taskList.map(task => {
+    return {
+      label: task.taskName,
+      children: (task.educationPaperList || []).map(paper => ({
+        label: paper.num || '未命名试卷',
+        id: paper.paperId,
+        num:paper.num,
+        taskName: task.taskName,
+        taskType: task.taskType,
+        que: '全部' ,
+        educationPaperSchemeList:task.educationPaperSchemeList
+      }))
     };
-  
-    /** 保存编辑 */
-    const save = () => {
-  formRef.value?.validate?.((valid) => {
-    if (!valid) {
-      return;
-    }
-    loading.value = true;
-    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
-      .then((msg) => {
-        loading.value = false;
-        message.success('新增成功！');
-        handleCancel();
-        emit('done');
-      })
-      .catch((e) => {
-        loading.value = false;
-        message.error(e.message);
-      });
   });
 };
+const handleNodeClick = (data) => {
+  if (!data.children) {
+    // 是试卷节点
+    if (!rightList.value.find(p => p.id === data.id)) {
+      rightList.value.push(data);
+    }
+  }
+};
+const getTaskTypeLabel = (type) => {
+  const map = {
+    '0': '练习',
+    '1': '考试',
+    '3': '冲刺练习'
+  };
+  return map[type] || '未知';
+};
+
+
+const handleDialogClose = () => {
+   if (!isConfirmClosing) {
+    selectedGroupType.value='',
+    rightList.value = [];
+    leftTreeData.value=[] // 只有不是确认才清空
+  }
+    isConfirmClosing = false; // 重置标志位
+}
+const onCancel = () => {
+  isConfirmClosing = false;
+  selectedGroupType.value='',
+  rightList.value = [];
+  leftTreeData.value=[]
+  scopeDialogVisible.value = false;
+};
+
+
+const checkAll = ref(false);
+const selectedQue = ref<string[]>([]);
+const currentSpNames = ref<Array<string>>([]); // 当前题型名列表
+const selectedRow = ref<any>(null); // 当前选中的试卷数据（可选）
+
+const openQueDialog = (row) => {
+
+  // 设置当前选中的题型列表
+  currentSpNames.value = row.educationPaperSchemeList?.map(item => item.spName) || [];
+
+  // 设置当前行（选中的试卷）用于后续保存
+  selectedRow.value = row;
+  queDialogVisible.value = true;
+};
+///
+
+watch(selectedQue, (val) => {
+  if (val.length === currentSpNames.value.length) {
+    checkAll.value = true;
+  } else {
+    checkAll.value = false;
+  }
+});
+
+const handleCheckAllChange = (val: boolean) => {
+  if (val) {
+    selectedQue.value = [...currentSpNames.value];
+  } else {
+    selectedQue.value = [];
+  }
+};
+
+
+
+// 确认选择题型，把逗号分隔字符串赋给该行que字段
+const confirmQue = async () => {
+  if (selectedRow.value) {
+    try {
+      const payload = {
+        taskId: props.taskId,
+        que: selectedQue.value // 数组形式传递
+      };
+
+     const res= await SmsChannelApi.checkType(payload);
+
+      // 可选：赋值用于前端展示（逗号拼接）
+      selectedRow.value.que = selectedQue.value.join(',');
+
+      ElMessage.success('题型设置成功');
+    } catch (err) {
+      console.error(err);
+      ElMessage.error('题型设置失败');
+    }
+  }
+
+  // 关闭弹窗 & 清空数据
+  queDialogVisible.value = false;
+  selectedRow.value = null;
+  selectedQue.value = [];
+  checkAll.value = false;
+};
+
+
+
+
+
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    isVisible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+formRef.value?.validate?.((valid) => {
+  if (!valid) {
+    return;
+  }
+  loading.value = true;
+  if (form.useCustomScope) {
+    console.log( form.num+"num")
+    console.log(rightList.value+"rightList.value")
+
+      if (!rightList.value || rightList.value.length === 0) {
+        ElMessage.warning('请先设置组卷范围！');
+        loading.value = false;
+        return; // 阻止后续逻辑
+      }
+    console.log( props.taskId)
+    const payload = {
+      num: form.num,
+      taskId: props.taskId,
+      paperList: rightList.value, // 如果是数组，字段名建议有“List”或“Array”
+    };
+    addPaperBypaper(payload)
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    console.log("自定义范围!");
+    }else{
+     console.log("不是自定义范围!");
+    addPaper({ num: form.num,taskid: props.taskId ,taskSpecialty:form.taskSpecialty})
+    .then((msg) => {
+      loading.value = false;
+      message.success('新增成功！');
+      handleCancel();
+      emit('done');
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+    }
+
+});
+};
 
   
-    /** 弹窗打开事件 */
-    const handleOpen = () => {
-        resetFields();
-        form.taskId = props.taskId; // 新增时赋值 taskId
-        form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
-      nextTick(() => {
-        nextTick(() => {
-          formRef.value?.clearValidate?.();
-        });
-      });
-    };
-    defineExpose({ open })
-  </script>
-  
\ No newline at end of file
+/** 弹窗打开事件 */
+const handleOpen = () => {
+    resetFields();
+    form.taskId = props.taskId; // 新增时赋值 taskId
+    form.taskSpecialty = props.taskSpecialty; // 新增时赋值 taskSpecialty
+  nextTick(() => {
+    nextTick(() => {
+      formRef.value?.clearValidate?.();
+    });
+  });
+};
+defineExpose({ open })
+</script>
diff --git a/src/views/task/trans/components/steps/step2/components/step-edit.vue b/src/views/task/trans/components/steps/step2/components/step-edit.vue
index d93a95d..1dcc3ca 100644
--- a/src/views/task/trans/components/steps/step2/components/step-edit.vue
+++ b/src/views/task/trans/components/steps/step2/components/step-edit.vue
@@ -22,7 +22,8 @@
           <dict-tag :type="DICT_TYPE.EXAM_QUE_DIFF" :value="scope.row.quLevel" />
         </template>
       </el-table-column>
-      <el-table-column label="知识点" prop="pointNames" align="left" />
+      <el-table-column label="章节" prop="pointNamesVo" align="left" />
+      <el-table-column label="知识点" prop="chapteridDictTextVo" align="left" />
   
     </el-table>
     </div>
@@ -172,14 +173,14 @@
 
 <Dialog v-model="visibleChange" :title="'换题列表'" width="80%" center  @close="handleCancelQue" >
   <ContentWrap>
-    <div style="display: flex; gap: 20px;height: 500px; width: 100%;">
+    <div style="display: flex; gap: 20px;height: 600px; width: 100%;">
 
       <!-- 左侧题目表格 -->
       <div style="flex: 3;">
 
                <!-- 搜索条件区域 -->
             <div style="margin-bottom: 16px; display: flex; gap: 12px; align-items: center; flex-wrap: wrap;">
-              <el-input
+              <!-- <el-input
                 v-model="queryParams.pointNames"
                 placeholder="试题知识点"
                 clearable
@@ -194,7 +195,7 @@
                 <el-option label="简单" value="0" />
                 <el-option label="一般" value="1" />
                 <el-option label="困难" value="2" />
-              </el-select>
+              </el-select> -->
               <el-input
                 v-model="queryParams.quNum"
                 placeholder="试题编号"
@@ -216,13 +217,13 @@
           <el-table-column label="试题编号" align="center"  prop="quNum" :show-overflow-tooltip="true"/>
           <el-table-column label="专业" align="center" prop="specialtyName" width="120" />
           <el-table-column label="课程" align="center" prop="courseName" :show-overflow-tooltip="true" />
-          <el-table-column label="章节名称" align="center" prop="chapteridDictText" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="章节名称" align="center" prop="chapteridDictText" :show-overflow-tooltip="true" /> -->
           <el-table-column label="难度" align="center" prop="quLevel" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.EXAM_QUE_DIFF" :value="scope.row.quLevel" />
             </template>
           </el-table-column>
-          <el-table-column label="知识点" align="center" prop="pointNames" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="知识点" align="center" prop="pointNames" :show-overflow-tooltip="true" /> -->
           <!-- <el-table-column label="审核状态" align="center" prop="audit" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.QUESTION_AUDIT" :value="scope.row.audit" />
@@ -447,6 +448,8 @@ const handleChange =async () => {
     message.warning('请先选中一个原题');
     return;
   }
+
+  console.log(selectedQuestion.value.quId+"selectedQuestion.value.quId")
   visibleChange.value = true;
    await getList();
 };
@@ -519,6 +522,11 @@ const handleRowClick = (row: any) => {
 const getList = async () => {
   loading.value = true
 queryParams.subjectName=selectedQuestion.value.subjectName
+queryParams.pointNames=selectedQuestion.value.pointNames
+queryParams.chapteridDictText=selectedQuestion.value.chapteridDictText
+queryParams.quLevel=selectedQuestion.value.quLevel
+queryParams.specialtyName=selectedQuestion.value.specialtyName
+queryParams.courseName=selectedQuestion.value.courseName
   try {
     const data = await QuestionApi.getQuestionlistAnswer(queryParams);
     list.value = data.list
diff --git a/src/views/task/trans/components/steps/step2/index.vue b/src/views/task/trans/components/steps/step2/index.vue
index 5819ae6..c703fa0 100644
--- a/src/views/task/trans/components/steps/step2/index.vue
+++ b/src/views/task/trans/components/steps/step2/index.vue
@@ -54,7 +54,7 @@
           plain
           @click="openSet"
         >
-          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷调整
+          <Icon icon="ep:set-up" class="mr-5px" /> 抽卷方式
         </el-button>
       <el-button
         type="primary"
@@ -117,7 +117,6 @@
             link
             type="primary"
             @click="openLook('look', scope.row.paperId)"
-            v-hasPermi="['system:sms-channel:update']"
           >
             查看
           </el-button>
@@ -125,15 +124,13 @@
             link
             type="primary"
             @click="openEdit('update', scope.row)"
-            v-hasPermi="['system:sms-channel:update']"
           >
             编辑
           </el-button>
           <el-button
             link
             type="danger"
-            @click="handleDelete(scope.row.paperId)"
-            v-hasPermi="['system:sms-channel:delete']"
+            @click="handleDelete(scope.row)"
           >
             删除
           </el-button>
@@ -344,10 +341,14 @@ const openLook = (type: string, paperId?: number) => {
 
 
 // 删除操作
-const handleDelete = async (id: number) => {
+const handleDelete = async (row?: any) => {
+      if (row?.counts > 0) {
+      ElMessage.warning('当前试卷使用次数大于0，不允许删除！');
+      return; 
+    }
   try {
     await message.delConfirm();
-    await PaperApi.removePaper(id);
+    await PaperApi.removePaper(row.paperId);
     message.success(t('common.delSuccess'));
     await getList();
   } catch (error) {
diff --git a/src/views/task/trans/components/steps/step3/index.vue b/src/views/task/trans/components/steps/step3/index.vue
index 268e506..b08fd62 100644
--- a/src/views/task/trans/components/steps/step3/index.vue
+++ b/src/views/task/trans/components/steps/step3/index.vue
@@ -5,15 +5,11 @@
       <!-- 第一个 tab - 通用参数 -->
       <el-tab-pane label="通用参数" name="tab1">
         <el-form :model="form" label-width="200px" style="margin-top: 20px;">
+
           <el-row :gutter="20">
             <el-col :span="12">
-
-              <el-form-item label="是否显示试题编号">
-                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
-                  inactive-text="否" @change="handleFormChange" />
-              </el-form-item>
               <!-- 是否使用监考密码验证 -->
-              <!-- <el-form-item label="是否使用监考密码验证">
+            <el-form-item label="是否使用监考密码验证">
             <el-switch 
               v-model="form.isExamPassword" 
               active-value="0" 
@@ -21,12 +17,49 @@
               active-text="是" 
               inactive-text="否" 
               @change="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item> 
 
               <!-- 监考密码 -->
-              <!-- <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
+              <el-form-item label="监考密码" v-if="form.isExamPassword === '0'">
             <el-input v-model="form.examPassword" placeholder="请输入监考密码" @input="handleFormChange" />
-          </el-form-item> -->
+          </el-form-item>
+           </el-col>
+             <el-col :span="12">
+              <!-- 练习成绩保存 -->
+              <el-form-item label="练习成绩保存">
+                <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
+                  <el-radio label="0">最高成绩</el-radio>
+                  <el-radio label="1">最新成绩</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <!-- <el-col :span="12">
+          <el-form-item label="是否显示重答按钮">
+            <el-switch 
+              v-model="form.isRepeat" 
+              active-value="0" 
+              inactive-value="1" 
+              active-text="是" 
+              inactive-text="否" 
+              @change="handleFormChange" />
+          </el-form-item>
+
+        </el-col> -->
+
+
+
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+
+              <el-form-item label="考生答题时是否显示试题编号">
+                <el-switch v-model="form.isAnswerId" active-value="0" inactive-value="1" active-text="是"
+                  inactive-text="否" @change="handleFormChange" />
+              </el-form-item>
+
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否显示试卷编号">
@@ -69,31 +102,8 @@
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row :gutter="20">
-            <el-col :span="12">
-
-              <!-- 练习成绩保存 -->
-              <el-form-item label="练习成绩保存">
-                <el-radio-group v-model="form.saveGrades" @change="handleFormChange">
-                  <el-radio label="0">最高成绩</el-radio>
-                  <el-radio label="1">最新成绩</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-
-            <!-- <el-col :span="12">
-          <el-form-item label="是否显示重答按钮">
-            <el-switch 
-              v-model="form.isRepeat" 
-              active-value="0" 
-              inactive-value="1" 
-              active-text="是" 
-              inactive-text="否" 
-              @change="handleFormChange" />
-          </el-form-item>
-
-        </el-col> -->
-
 
             <el-col :span="12">
               <el-form-item label="是否有测评时长限制">
@@ -101,20 +111,6 @@
                   @change="handleFormChange" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <!-- <el-col :span="12">
-      <el-form-item label="是否有测评时长限制">
-        <el-switch 
-          v-model="form.isTime" 
-          active-value="0" 
-          inactive-value="1" 
-          active-text="是" 
-          inactive-text="否" 
-          @change="handleFormChange" />
-      </el-form-item>
-        </el-col> -->
-
             <el-col :span="12">
               <el-form-item label="测评时长">
                 <el-time-picker v-model="form.examTime" value-format="HH:mm:ss" placeholder="请设置测评时长" class="ele-fluid"
@@ -135,17 +131,31 @@
           </el-form-item>
         </el-col> -->
           </el-row>
-
-
           <el-row :gutter="20">
 
 
+
+          <el-col :span="12">
+              <!-- 禁止学生使用U盘 -->
+              <el-form-item label="是否显示成绩">
+                <el-switch v-model="form.isScore" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
+              <el-form-item label="是否显示成绩明细">
+                <el-switch v-model="form.isScoreDetail" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+
+
+
               <!-- <el-form-item label="定时检查与学生端联通性，每">
             <el-input-number v-model="form.isConnect"  label="分钟" @change="handleFormChange" />
             <span>分钟传一次,断联直接交卷</span>
           </el-form-item> -->
-            </el-col>
+          
           </el-row>
 
 
@@ -175,13 +185,7 @@
             <span>分钟传一次</span>
           </el-form-item>
 
-          <!-- 完成考试后是否删除考试目录 -->
-          <!-- <el-form-item label="完成考试后是否删除考试目录">
-            <el-radio-group v-model="form.isDel" @change="handleFormChange">
-              <el-radio label="0">是</el-radio>
-              <el-radio label="1">否</el-radio>
-            </el-radio-group>
-          </el-form-item> -->
+   
         </el-form>
       </el-tab-pane>
 
@@ -225,6 +229,17 @@
               </el-form-item>
             </el-col>
           </el-row>
+          
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="是否允许复制题干">
+                <el-switch v-model="form.isCpoy" active-value="0" inactive-value="1" active-text="是" inactive-text="否"
+                  @change="handleFormChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+      
 
         </el-form>
       </el-tab-pane>
@@ -261,7 +276,7 @@ const form = ref({
   driver: '',             // 存放系统盘
   directory: '',          // 考试目录名称
   uploadTime: '',         // 上传间隔时间
-  isDel: '',
+  isCpoy: '',
   isRepeat: '',           // 是否删除目录
   isAnswer: '',
   isLook: '',
@@ -269,7 +284,9 @@ const form = ref({
   isFile: '',
   isNet: '',
   isScreen: '',
-  warn: ''
+  warn: '',
+  isScore:'',
+  isScoreDetail:'',
 })
 
 const activeTab = ref('tab1')
diff --git a/src/views/task/trans/components/steps/step5/components/person-edit.vue b/src/views/task/trans/components/steps/step5/components/person-edit.vue
index 3c57ff3..8b0dcd7 100644
--- a/src/views/task/trans/components/steps/step5/components/person-edit.vue
+++ b/src/views/task/trans/components/steps/step5/components/person-edit.vue
@@ -187,7 +187,7 @@ const removeBatch = async () => {
   }
 
   await ElMessageBox.confirm(
-    '确定要删除选中的人员吗？',
+    '只能删除待考状态的学生,是否确认删除？',
     '警告',
     {
       confirmButtonText: '确定',
diff --git a/src/views/task/trans/components/steps/step5/index.vue b/src/views/task/trans/components/steps/step5/index.vue
index b002c0b..311e1ad 100644
--- a/src/views/task/trans/components/steps/step5/index.vue
+++ b/src/views/task/trans/components/steps/step5/index.vue
@@ -196,7 +196,15 @@ const handleDeletes = async () => {
     message.error('请至少选择一条数据');
     return;
   }
-
+    await ElMessageBox.confirm(
+      '只能删除待考状态的学生,是否确认删除？',
+      '警告',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    );
   selectedRows.value = rows.map((d: any) => d.id); // 保存选中的行数据
 
   const deleteData = {