From 450d458d089f699da9797f10d8938d59bd44ab2d Mon Sep 17 00:00:00 2001
From: huababa1 <2037205722@qq.com>
Date: Thu, 16 Oct 2025 19:15:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E4=BB=BB=E5=8A=A1=E5=85=B1=E4=BA=AB=EF=BC=8C?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=86=E7=82=B9=E5=85=A8=E9=80=89=EF=BC=8C=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E9=A2=98=E8=AF=95=E9=A2=98=E8=80=83=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=EF=BC=8C=E8=80=83=E7=82=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E9=A2=98=E5=B9=B2=E4=BD=8D=E7=BD=AE=EF=BC=8C=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E7=AE=A1=E7=90=86=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/index.ts                |   4 +
 src/views/Login/components/LoginForm.vue      |   7 +
 src/views/monitor/monitor/index.vue           |   6 +
 src/views/paper/question/BrowerForm.vue       |  13 +-
 src/views/paper/question/EmailForm.vue        |  94 +++++++++++-
 src/views/paper/question/FileForm.vue         |  13 +-
 src/views/paper/question/MysqlForm.vue        |  14 +-
 src/views/paper/question/PsForm.vue           |  92 +++++++++---
 src/views/paper/question/SettingForm.vue      |  96 +++++++++++-
 .../question/WindowsSystemSettingForm.vue     |  99 +++++++++++--
 src/views/paper/question/WpsPptxForm.vue      |  61 +++++++-
 src/views/paper/question/WpsWordForm.vue      |  62 +++++++-
 src/views/paper/question/WpsXlsxForm.vue      | 140 ++++++++++++++----
 src/views/paper/question/index.vue            |  97 +++++++++---
 src/views/system/tenant/TenantForm.vue        |  24 +--
 src/views/system/tenant/index.vue             |  64 +++++++-
 .../steps/step1/components/step-edit.vue      |  28 ++++
 .../steps/step4/components/step-edit.vue      |   8 +-
 src/views/task/exam/components/task-add.vue   |  14 +-
 src/views/task/exam/components/task-temp.vue  |   2 +-
 src/views/task/exam/index.vue                 |   5 +
 .../steps/step1/components/step-edit.vue      |  28 ++++
 .../steps/step4/components/step-edit.vue      |   8 +-
 .../collegeexam/components/task-add.vue       |  14 +-
 .../collegeexam/components/task-temp.vue      |   1 -
 .../task/selftrans/collegeexam/index.vue      |   5 +
 .../steps/step1/components/step-edit.vue      |  30 ++++
 .../steps/step4/components/step-edit.vue      |   8 +-
 .../selftrans/module/components/task-add.vue  |  14 +-
 .../selftrans/module/components/task-temp.vue |   1 -
 src/views/task/selftrans/module/index.vue     |   5 +
 .../steps/step1/components/step-edit.vue      |  28 ++++
 .../steps/step4/components/step-edit.vue      |   8 +-
 .../selftrans/random/components/task-add.vue  |  14 +-
 .../selftrans/random/components/task-temp.vue |   1 -
 src/views/task/selftrans/random/index.vue     |   5 +
 .../steps/step1/components/step-edit.vue      |  29 ++++
 .../steps/step4/components/step-edit.vue      |   8 +-
 src/views/task/sprint/components/task-add.vue |  14 +-
 .../task/sprint/components/task-temp.vue      |   1 -
 src/views/task/sprint/index.vue               |   5 +
 .../steps/step1/components/step-edit.vue      |  29 ++++
 .../steps/step4/components/step-edit.vue      |   8 +-
 src/views/task/trans/components/task-add.vue  |  14 +-
 src/views/task/trans/components/task-temp.vue |   1 -
 src/views/task/trans/index.vue                |   5 +
 46 files changed, 1064 insertions(+), 163 deletions(-)

diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index 209e512..8c3b50c 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -66,3 +66,7 @@ export const deleteTenant = (id: number) => {
 export const exportTenant = (params: TenantExportReqVO) => {
   return request.download({ url: '/system/tenant/export-excel', params })
 }
+
+export const resetPassword = (data) => {
+  return request.post({url: '/system/tenant/reset-password', data,})
+}
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 22e4233..84d4702 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -271,6 +271,13 @@ const loginOutAdminPassword = async () => {
    }
   LoginApi.refreshLogout(data).then((res) => {
     if (res) {
+      if (res === '900002') {
+         ElMessageBox.alert('管理员密码错误，请重新输入！', '提示', {
+        confirmButtonText: '确认',
+        type: 'error',
+      })
+        return
+      }
       message.success(res)
       isTrueLoginForAdminPassWord.value = false
     }
diff --git a/src/views/monitor/monitor/index.vue b/src/views/monitor/monitor/index.vue
index 3f110d7..081f0d3 100644
--- a/src/views/monitor/monitor/index.vue
+++ b/src/views/monitor/monitor/index.vue
@@ -172,6 +172,12 @@
       </el-table-column>
       <el-table-column label="试卷任务" align="center" prop="taskName" />
       <el-table-column label="机器ip" align="center" prop="ip" width="180px"/>
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+      />
       <el-table-column
         label="剩余时间"
         align="center"
diff --git a/src/views/paper/question/BrowerForm.vue b/src/views/paper/question/BrowerForm.vue
index fe4fa24..73ab3aa 100644
--- a/src/views/paper/question/BrowerForm.vue
+++ b/src/views/paper/question/BrowerForm.vue
@@ -200,7 +200,7 @@
                     </div>
 
                         <!-- 弹框 -->
-                          <el-dialog
+                          <Dialog
                             title="考点设置"
                             v-model="kaoDialogVisible"
                             width="60%"
@@ -208,6 +208,15 @@
                             class="custom-dialog"
                              draggable
                           >
+                          <div
+                            style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 100%; overflow: hidden;"
+                          >
+                            <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+                            <el-scrollbar height="200px">
+                              <!-- 支持富文本渲染 -->
+                              <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+                            </el-scrollbar>
+                          </div>
                             <!-- 可滚动容器 -->
                             <div style="height: 400px; overflow-y: auto;">
                               <el-table
@@ -299,7 +308,7 @@
                               <el-button @click="confimKaoFalse">取消</el-button>
                               <el-button type="primary" @click="confirmKao">确定</el-button>
                             </template>
-                          </el-dialog>
+                          </Dialog>
 
                   
 
diff --git a/src/views/paper/question/EmailForm.vue b/src/views/paper/question/EmailForm.vue
index 4e877c8..a23dde6 100644
--- a/src/views/paper/question/EmailForm.vue
+++ b/src/views/paper/question/EmailForm.vue
@@ -152,11 +152,26 @@
                           <el-input v-model="scope.row.scoreRate" placeholder="请输入权值" />
                         </template>
                       </el-table-column>
-                      <el-table-column label="操作" align="center" width="100px">
-                        <template #default="scope">
-                          <el-button type="primary" link @click="handleDelete(scope.row)">
-                            <Icon icon="ep:delete" />删除
-                          </el-button>
+                      <el-table-column label="操作" align="center" width="140px">
+                        <template #default="{ row }">
+                          <el-button
+                            :icon="ArrowUp"
+                            circle
+                            size="small"
+                            @click="moveUp(row)"
+                            title="上移"
+                          />
+                          <el-button
+                            :icon="ArrowDown"
+                            circle
+                            size="small"
+                            @click="moveDown(row)"
+                            title="下移"
+                          />
+                          <el-button
+                            @click="handleDelete(row)"
+                            >—</el-button
+                          >
                         </template>
                       </el-table-column>
                     </el-table>
@@ -287,11 +302,52 @@
   <el-dialog
     v-model="dialogFormVisibleWordInfo"
     title="邮件设置"
-    width="1500px"
+    width="80%"
     style="overflow: scroll"
     @close="handleEmailForm"
   >
+      <!-- 外层容器 -->
+  <div
+    style="
+      display: flex;
+      height: 75vh; /* 占用弹窗可视区域 */
+      gap: 16px;
+      box-sizing: border-box;
+    "
+  >
+    <!-- 右边：试题内容 -->
+    <div
+      style="
+        flex: 2;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        padding: 10px;
+        overflow: auto; /* ✅ 同样可以滚动 */
+      "
+    >
+      <h3 style="margin-bottom: 10px;">试题内容：</h3>
+      <div
+        v-html="formData.content"
+        style="
+          white-space: pre-wrap;
+          line-height: 1.6;
+        "
+      ></div>
+    </div>
+
+    <!-- 左边：WindowsSystemSetting -->
+    <div
+      style="
+        flex: 4;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        padding: 10px;
+        overflow: auto; /* ✅ 关键点 */
+      "
+    >
     <Email />
+    </div>
+  </div>
   </el-dialog>
 </template>
 <script lang="ts" setup>
@@ -305,7 +361,7 @@ import * as SpecialtyApi from '@/api/points'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { cloneDeep } from 'lodash-es'
 import { useEmailStore } from '@/store/modules/email'
-
+import { ArrowUp, ArrowDown, Delete } from '@element-plus/icons-vue'
 const emailStore = useEmailStore()
 
 defineOptions({ name: 'WpsWordFrom' })
@@ -397,6 +453,30 @@ const addEmailInfo = async () => {
 const handleEmailForm = () => {
   list.value = [...emailStore.emailFormList]
   // emailStore.clearEmailData() // 如果需要清空数据，可以取消注释
+}
+  // 上移
+ function moveUp(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index > 0) {
+      [list.value[index - 1], list.value[index]] = [list.value[index], list.value[index - 1]];
+    }
+      updateSort()
+  }
+
+  // 下移
+ function moveDown(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index !== -1 && index < list.value.length - 1) {
+      [list.value[index + 1], list.value[index]] = [list.value[index], list.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  list.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
 }
 const handleDelete = (row) => {
   console.log(row)
diff --git a/src/views/paper/question/FileForm.vue b/src/views/paper/question/FileForm.vue
index 96165de..9d25bf3 100644
--- a/src/views/paper/question/FileForm.vue
+++ b/src/views/paper/question/FileForm.vue
@@ -250,7 +250,7 @@
                     </div>
 
                         <!-- 弹框 -->
-                          <el-dialog
+                          <Dialog 
                             title="考点设置"
                             v-model="kaoDialogVisible"
                             width="60%"
@@ -258,6 +258,15 @@
                             class="custom-dialog"
                             draggable
                           >
+                          <div
+                            style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 100%; overflow: hidden;"
+                          >
+                            <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+                            <el-scrollbar height="200px">
+                              <!-- 支持富文本渲染 -->
+                              <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+                            </el-scrollbar>
+                          </div>
                             <!-- 可滚动容器 -->
                             <div style="height: 400px; overflow-y: auto;">
                               <el-table
@@ -346,7 +355,7 @@
                         <el-button @click="kaoDialogVisible = false">取消</el-button>
                         <el-button type="primary" @click="confirmKao">确定</el-button>
                       </template>
-                    </el-dialog>
+                    </Dialog>
 
                   
 
diff --git a/src/views/paper/question/MysqlForm.vue b/src/views/paper/question/MysqlForm.vue
index d753e90..f287f29 100644
--- a/src/views/paper/question/MysqlForm.vue
+++ b/src/views/paper/question/MysqlForm.vue
@@ -202,7 +202,7 @@
                     </div>
 
                         <!-- 弹框 -->
-                          <el-dialog
+                          <Dialog
                             title="考点设置"
                             v-model="kaoDialogVisible"
                             width="60%"
@@ -210,6 +210,16 @@
                             class="custom-dialog"
                              draggable
                           >
+                          <!-- ✅ 新增：题干展示区 -->
+                          <div
+                            style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 100%; overflow: hidden;"
+                          >
+                            <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+                            <el-scrollbar height="200px">
+                              <!-- 支持富文本渲染 -->
+                              <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+                            </el-scrollbar>
+                          </div>
                             <!-- 可滚动容器 -->
                             <div style="height: 400px; overflow-y: auto;width:100%;">
                               <el-table
@@ -321,7 +331,7 @@
                               <el-button @click="kaoDialogVisible = false">取消</el-button>
                               <el-button type="primary" @click="confirmKao">确定</el-button>
                             </template>
-                          </el-dialog>
+                          </Dialog>
 
 
                   
diff --git a/src/views/paper/question/PsForm.vue b/src/views/paper/question/PsForm.vue
index fb31349..d2cd2ee 100644
--- a/src/views/paper/question/PsForm.vue
+++ b/src/views/paper/question/PsForm.vue
@@ -249,7 +249,7 @@
                     </div>
 
                         <!-- 弹框 -->
-                          <el-dialog
+                          <Dialog
                             title="考点设置"
                             v-model="kaoDialogVisible"
                             width="60%"
@@ -257,6 +257,16 @@
                             class="custom-dialog"
                             draggable
                           >
+                           <!-- ✅ 新增：题干展示区 -->
+                          <div
+                            style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 250px; overflow: hidden;"
+                          >
+                            <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+                            <el-scrollbar height="200px">
+                              <!-- 支持富文本渲染 -->
+                              <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+                            </el-scrollbar>
+                          </div>
                             <!-- 可滚动容器 -->
                           <div style="height: 400px; overflow: hidden; display: flex; gap: 16px;">
                             <div style="flex: 1; overflow: auto; border: 1px solid #eee; padding: 8px;">
@@ -277,8 +287,8 @@
                             <div style="flex: 1; overflow: auto; border: 1px solid #eee; padding: 8px;">
                               <h3>考生表格（右侧）</h3>
                               <el-table :data="flatPointList" style="width: 100%; min-width: 300px;"   :row-key="(row) => row.id">
+                                <el-table-column prop="sort" label="序号" />
                                 <el-table-column prop="label" label="值" />
-                                
                                 <el-table-column prop="rate" label="权值">
                                   <template #default="{ row }">
                                     <el-input
@@ -288,14 +298,26 @@
                                     />
                                   </template>
                                 </el-table-column>
-                                <el-table-column prop="sort" label="排序" />
-                                <el-table-column label="操作" width="60">
-                                  <template #default="{  $index }">
-                                    <span
-                                      @click="removePoint($index)"
-                                      style="cursor: pointer;  font-weight: bold; font-size: 18px;"
-                                      title="点击删除"
-                                    >—</span>
+                                <el-table-column label="操作" width="140px">
+                                  <template #default="{ row }">
+                                    <el-button
+                                      :icon="ArrowUp"
+                                      circle
+                                      size="small"
+                                      @click="moveUp(row)"
+                                      title="上移"
+                                    />
+                                    <el-button
+                                      :icon="ArrowDown"
+                                      circle
+                                      size="small"
+                                      @click="moveDown(row)"
+                                      title="下移"
+                                    />
+                                    <el-button
+                                      @click="removePoint(row)"
+                                      >—</el-button
+                                    >
                                   </template>
                                 </el-table-column>
                               </el-table>
@@ -313,7 +335,7 @@
                         <el-button @click="kaoDialogVisible = false">取消</el-button>
                         <el-button type="primary" @click="confirmKao">确定</el-button>
                       </template>
-                    </el-dialog>
+                    </Dialog>
 
                   
 
@@ -569,6 +591,9 @@ const kaodianData = ref({
 const answerList = ref([]); // 从接口赋值
 const pointList = ref([]); // 从接口赋值
 const kaodianList = ref([]); // 从接口赋值
+// 定义右侧表格数据，初始时根据 pointList 构造
+const flatPointList = ref<{ key: string; label: string; rate: number ,sort:number,index:number}[]>([]);
+const flatkaodianList = ref<{ key: string; label: string; rate: number }[]>([]);
 
 const treeProps = {
   label: 'key',
@@ -595,8 +620,14 @@ console.log(answerList)
 
    QuestionApi.setPsPoint(payload);
    QuestionApi.setPsPoint(payloadAnswer);
-  // const res = await QuestionApi.getListByQuId(kaodianData.value.quId);
-  // kaodianList.value = res;
+  flatkaodianList.value = flatPointList.value.map(item => ({
+    key: item.key,
+    label: item.label,
+    rate: item.rate,
+    sort: item.sort
+  }));
+
+
   kaoDialogVisible.value = false;
 };
 
@@ -630,9 +661,7 @@ function buildTreeFromFlatList(flatList) {
   return root;
 }
 
-// 定义右侧表格数据，初始时根据 pointList 构造
-const flatPointList = ref<{ key: string; label: string; rate: number ,sort:number}[]>([]);
-const flatkaodianList = ref<{ key: string; label: string; rate: number }[]>([]);
+
 
 
 function flattenPsVoList(list, parentPath = '') {
@@ -642,7 +671,7 @@ function flattenPsVoList(list, parentPath = '') {
     if (item.children && item.children.length > 0) {
       result.push(...flattenPsVoList(item.children, currentPath));
     } else {
-      const symbol = item.value === true ? '✅' : item.value === false ? '❌' : item.value;
+      const symbol = item.value === 'true' ? '✅' : item.value === 'false' ? '❌' : item.value;
       result.push({
         key: item.key,  // 一定要有 key
         label: `${currentPath}: ${symbol}`,
@@ -651,6 +680,11 @@ function flattenPsVoList(list, parentPath = '') {
       });
     }
   });
+  
+  // 添加 index 字段
+  result.forEach((item, idx) => {
+    item.index = idx;
+  });
   return result;
 }
 function flattenPsVoListOther(list, parentPath = '') {
@@ -1096,6 +1130,30 @@ const handleNodeClick = (data, node) => {
   // 可选：关闭弹窗
   dialogVisiblePoints.value = false;
 };
+  // 上移
+ function moveUp(row) {
+    const index = flatPointList.value.findIndex(item => item === row);
+    if (index > 0) {
+      [flatPointList.value[index - 1], flatPointList.value[index]] = [flatPointList.value[index], flatPointList.value[index - 1]];
+    }
+      updateSort()
+  }
+
+  // 下移
+ function moveDown(row) {
+    const index = flatPointList.value.findIndex(item => item === row);
+    if (index !== -1 && index < flatPointList.value.length - 1) {
+      [flatPointList.value[index + 1], flatPointList.value[index]] = [flatPointList.value[index], flatPointList.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  flatPointList.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
+}
 const removePoint = (index: number) => {
   flatPointList.value.splice(index, 1);
 };
diff --git a/src/views/paper/question/SettingForm.vue b/src/views/paper/question/SettingForm.vue
index 5ef07f9..1a7a0b8 100644
--- a/src/views/paper/question/SettingForm.vue
+++ b/src/views/paper/question/SettingForm.vue
@@ -147,11 +147,26 @@
                           <el-input v-model="scope.row.scoreRate" placeholder="请输入权值" />
                         </template>
                       </el-table-column>
-                      <el-table-column label="操作" align="center" width="100px">
-                        <template #default="scope">
-                          <el-button type="primary" link @click="handleDelete(scope.row)">
-                            <Icon icon="ep:delete" />删除
-                          </el-button>
+                      <el-table-column label="操作" align="center" width="140px">
+                        <template #default="{ row }">
+                          <el-button
+                            :icon="ArrowUp"
+                            circle
+                            size="small"
+                            @click="moveUp(row)"
+                            title="上移"
+                          />
+                          <el-button
+                            :icon="ArrowDown"
+                            circle
+                            size="small"
+                            @click="moveDown(row)"
+                            title="下移"
+                          />
+                          <el-button
+                            @click="handleDelete(row)"
+                            >—</el-button
+                          >
                         </template>
                       </el-table-column>
                     </el-table>
@@ -213,14 +228,55 @@
   </div>
   <!-- 表单弹窗：添加/修改 -->
   <FileForm ref="FileRef" @success="handleUploadSuccess" />
-  <el-dialog
+  <Dialog
     v-model="dialogFormVisibleWordInfo"
     title="考点设置"
-    width="1100px"
+    width="80%"
     @close="handleFrom"
   >
+  <!-- 外层容器 -->
+  <div
+    style="
+      display: flex;
+      height: 75vh; /* 占用弹窗可视区域 */
+      gap: 16px;
+      box-sizing: border-box;
+    "
+  >
+    <!-- 右边：试题内容 -->
+    <div
+      style="
+        flex: 2;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        padding: 10px;
+        overflow: auto; /* ✅ 同样可以滚动 */
+      "
+    >
+      <h3 style="margin-bottom: 10px;">试题内容：</h3>
+      <div
+        v-html="formData.content"
+        style="
+          white-space: pre-wrap;
+          line-height: 1.6;
+        "
+      ></div>
+    </div>
+
+    <!-- 左边：WindowsSystemSetting -->
+    <div
+      style="
+        flex: 4;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        padding: 10px;
+        overflow: auto; /* ✅ 关键点 */
+      "
+    >
     <Setting />
-  </el-dialog>
+    </div>
+  </div>
+  </Dialog>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
@@ -231,6 +287,7 @@ import Setting from '@/components/Setting/index.vue'
 import * as SpecialtyApi from '@/api/points'
 import { handleTree } from '@/utils/tree'
 import { useSettingStore } from '@/store/modules/settings'
+import { ArrowUp, ArrowDown, Delete } from '@element-plus/icons-vue'
 const settingStore = useSettingStore()
 // import { emitter } from '@/utils/eventBus'
 
@@ -322,7 +379,30 @@ const dialogFormVisibleWordInfo = ref(false)
 const addWordInfo = async () => {
   dialogFormVisibleWordInfo.value = true
 }
+  // 上移
+ function moveUp(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index > 0) {
+      [list.value[index - 1], list.value[index]] = [list.value[index], list.value[index - 1]];
+    }
+      updateSort()
+  }
 
+  // 下移
+ function moveDown(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index !== -1 && index < list.value.length - 1) {
+      [list.value[index + 1], list.value[index]] = [list.value[index], list.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  list.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
+}
 const handleDelete = (row) => {
   for (let i = 0; i < list.value.length; i++) {
     if (row.content == list.value[i].content) {
diff --git a/src/views/paper/question/WindowsSystemSettingForm.vue b/src/views/paper/question/WindowsSystemSettingForm.vue
index b1f0d86..836eeaa 100644
--- a/src/views/paper/question/WindowsSystemSettingForm.vue
+++ b/src/views/paper/question/WindowsSystemSettingForm.vue
@@ -133,11 +133,26 @@
                           <el-input v-model="scope.row.scoreRate" placeholder="请输入权值" />
                         </template>
                       </el-table-column>
-                      <el-table-column label="操作" align="center" width="100px">
-                        <template #default="scope">
-                          <el-button type="danger" plain @click="handleDelete(scope.row)" link>
-                            删除
-                          </el-button>
+                      <el-table-column label="操作" align="center" width="140px">
+                        <template #default="{ row }">
+                          <el-button
+                            :icon="ArrowUp"
+                            circle
+                            size="small"
+                            @click="moveUp(row)"
+                            title="上移"
+                          />
+                          <el-button
+                            :icon="ArrowDown"
+                            circle
+                            size="small"
+                            @click="moveDown(row)"
+                            title="下移"
+                          />
+                          <el-button
+                            @click="handleDelete(row)"
+                            >—</el-button
+                          >
                         </template>
                       </el-table-column>
                     </el-table>
@@ -156,14 +171,56 @@
   </div>
   <!-- 表单弹窗：添加/修改 -->
   <FileForm ref="FileRef" @success="handleUploadSuccess" />
-  <el-dialog
+  <Dialog
     v-model="dialogFormVisibleWindowsSystemInfo"
     title="Windows系统设置考点"
-    width="1100px"
+    width="80%"
     @close="handleFrom"
   >
-    <WindowsSystemSetting />
-  </el-dialog>
+    <!-- 外层容器 -->
+  <div
+    style="
+      display: flex;
+      height: 75vh; /* 占用弹窗可视区域 */
+      gap: 16px;
+      box-sizing: border-box;
+    "
+  >
+    <!-- 右边：试题内容 -->
+    <div
+      style="
+        flex: 2;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        padding: 10px;
+        overflow: auto; /* ✅ 同样可以滚动 */
+      "
+    >
+      <h3 style="margin-bottom: 10px;">试题内容：</h3>
+      <div
+        v-html="formData.content"
+        style="
+          white-space: pre-wrap;
+          line-height: 1.6;
+        "
+      ></div>
+    </div>
+
+    <!-- 左边：WindowsSystemSetting -->
+    <div
+      style="
+        flex: 4;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        padding: 10px;
+        overflow: auto; /* ✅ 关键点 */
+      "
+    >
+      <h3 style="margin-bottom: 10px;">系统设置</h3>
+      <WindowsSystemSetting />
+    </div>
+  </div>
+  </Dialog>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
@@ -174,6 +231,7 @@ import WindowsSystemSetting from '@/components/WindowsSystemSetting/index.vue'
 import * as SpecialtyApi from '@/api/points'
 import { handleTree } from '@/utils/tree'
 import { useSettingStore } from '@/store/modules/settings'
+import { ArrowUp, ArrowDown, Delete } from '@element-plus/icons-vue'
 const settingStore = useSettingStore()
 
 defineOptions({ name: 'WindowsSystemSettingForm' })
@@ -260,7 +318,30 @@ const dialogFormVisibleWindowsSystemInfo = ref(false)
 const addWindowsSystemInfo = async () => {
   dialogFormVisibleWindowsSystemInfo.value = true
 }
+  // 上移
+ function moveUp(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index > 0) {
+      [list.value[index - 1], list.value[index]] = [list.value[index], list.value[index - 1]];
+    }
+      updateSort()
+  }
 
+  // 下移
+ function moveDown(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index !== -1 && index < list.value.length - 1) {
+      [list.value[index + 1], list.value[index]] = [list.value[index], list.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  list.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
+}
 const handleDelete = (row) => {
   for (let i = 0; i < list.value.length; i++) {
     if (row.content == list.value[i].content) {
diff --git a/src/views/paper/question/WpsPptxForm.vue b/src/views/paper/question/WpsPptxForm.vue
index 634ae2e..5ebec0b 100644
--- a/src/views/paper/question/WpsPptxForm.vue
+++ b/src/views/paper/question/WpsPptxForm.vue
@@ -280,9 +280,18 @@
   <!-- 表单弹窗：添加/修改 -->
   <FileForm ref="FileRef" @success="handleUploadSuccess" />
 
-  <el-dialog v-model="dialogFormVisiblePptxInfo" title="考点设置" width="70%">
+  <Dialog  v-model="dialogFormVisiblePptxInfo" title="考点设置" width="70%">
     <input type="file" id="slideFile" accept=".pptx" />
     <button @click="getSlideDataInfo">文件解析</button>
+    <div
+      style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 100%; overflow: hidden;"
+    >
+      <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+      <el-scrollbar height="200px">
+        <!-- 支持富文本渲染 -->
+        <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+      </el-scrollbar>
+    </div>
     <div style="height: 400px; overflow: hidden; display: flex; gap: 16px">
       <div
         class="tree-wrap"
@@ -308,13 +317,25 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" width="100px">
+          <el-table-column label="操作" width="140px">
             <template #default="{ row }">
-              <span
+              <el-button
+                :icon="ArrowUp"
+                circle
+                size="small"
+                @click="moveUp(row)"
+                title="上移"
+              />
+              <el-button
+                :icon="ArrowDown"
+                circle
+                size="small"
+                @click="moveDown(row)"
+                title="下移"
+              />
+              <el-button
                 @click="removePoint(row)"
-                style="cursor: pointer; font-weight: bold; font-size: 18px"
-                title="点击删除"
-                >—</span
+                >—</el-button
               >
             </template>
           </el-table-column>
@@ -323,7 +344,7 @@
     </div>
     <!-- <el-skeleton :rows="5" animated v-if="pptxPointsList.length < 0 && isLoading" />
      -->
-  </el-dialog>
+  </Dialog>
   <el-dialog
     v-model="dialogFormVisiblePptxInfos"
     :title="titles"
@@ -356,7 +377,7 @@ import { FormRules } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
 import FileForm from './components/FileForm.vue'
 import { ElLoading } from 'element-plus'
-
+import { ArrowUp, ArrowDown, Delete } from '@element-plus/icons-vue'
 defineOptions({ name: 'WpsPptxFrom' })
 const pptxPointsList = ref<Tree[]>([]) // 树形结构
 const pptxPointsInfoList = ref<Tree[]>([]) // 树形结构
@@ -424,6 +445,30 @@ interface PptxPoints {
   method?: string
 }
 let pptxPointsInfosList: PptxPoints[] = []
+  // 上移
+ function moveUp(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index > 0) {
+      [list.value[index - 1], list.value[index]] = [list.value[index], list.value[index - 1]];
+    }
+      updateSort()
+  }
+
+  // 下移
+ function moveDown(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index !== -1 && index < list.value.length - 1) {
+      [list.value[index + 1], list.value[index]] = [list.value[index], list.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  list.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
+}
 const removePoint = (row) => {
   // list.value.splice(index, 1)
   for (let i = 0; i < list.value.length; i++) {
diff --git a/src/views/paper/question/WpsWordForm.vue b/src/views/paper/question/WpsWordForm.vue
index 806192d..862b21f 100644
--- a/src/views/paper/question/WpsWordForm.vue
+++ b/src/views/paper/question/WpsWordForm.vue
@@ -280,9 +280,19 @@
   <!-- 表单弹窗：添加/修改 -->
   <FileForm ref="FileRef" @success="handleUploadSuccess" />
 
-  <el-dialog v-model="dialogFormVisibleWordInfo" title="考点设置" width="70%">
+  <Dialog  v-model="dialogFormVisibleWordInfo" title="考点设置" width="70%">
     <input type="file" id="docxFile" accept=".docx" />
     <button @click="getDocxDataInfo">文件解析</button>
+ <!-- ✅ 新增：题干展示区 -->
+    <div
+      style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 100%; overflow: hidden;"
+    >
+      <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+      <el-scrollbar height="200px">
+        <!-- 支持富文本渲染 -->
+        <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+      </el-scrollbar>
+    </div>
     <div style="height: 400px; overflow: hidden; display: flex; gap: 16px">
       <div style="flex: 0.5; overflow: auto; border: 1px solid #eee; padding: 8px">
         <h3>考点</h3>
@@ -305,13 +315,25 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" width="100px">
+          <el-table-column label="操作" width="140px">
             <template #default="{ row }">
-              <span
+              <el-button
+                :icon="ArrowUp"
+                circle
+                size="small"
+                @click="moveUp(row)"
+                title="上移"
+              />
+              <el-button
+                :icon="ArrowDown"
+                circle
+                size="small"
+                @click="moveDown(row)"
+                title="下移"
+              />
+              <el-button
                 @click="removePoint(row)"
-                style="cursor: pointer; font-weight: bold; font-size: 18px"
-                title="点击删除"
-                >—</span
+                >—</el-button
               >
             </template>
           </el-table-column>
@@ -321,7 +343,7 @@
 
     <!-- <el-skeleton :rows="5" animated v-if="wordPointsList.length < 0 && isLoading" />
      -->
-  </el-dialog>
+  </Dialog>
 <el-dialog v-model="dialogFormVisibleWordInfos" :title="titles" width="300px">
   <el-tree
     style="max-width: 600px"
@@ -359,7 +381,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import { FormRules } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
 import FileForm from './components/FileForm.vue'
-
+import { ArrowUp, ArrowDown, Delete } from '@element-plus/icons-vue'
 defineOptions({ name: 'WpsWordFrom' })
 const wordPointsList = ref<Tree[]>([]) // 树形结构
 const wordPointsInfoList = ref<Tree[]>([]) // 树形结构
@@ -435,6 +457,30 @@ interface WordPointsInfo {
   method?: string;
 }
 let wordPointsInfosList: WordPointsInfo[] = []
+  // 上移
+ function moveUp(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index > 0) {
+      [list.value[index - 1], list.value[index]] = [list.value[index], list.value[index - 1]];
+    }
+      updateSort()
+  }
+
+  // 下移
+ function moveDown(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index !== -1 && index < list.value.length - 1) {
+      [list.value[index + 1], list.value[index]] = [list.value[index], list.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  list.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
+}
 const removePoint = (row) => {
   // list.value.splice(index, 1)
   for (let i = 0; i < list.value.length; i++) {
diff --git a/src/views/paper/question/WpsXlsxForm.vue b/src/views/paper/question/WpsXlsxForm.vue
index 5296856..fb85fa5 100644
--- a/src/views/paper/question/WpsXlsxForm.vue
+++ b/src/views/paper/question/WpsXlsxForm.vue
@@ -280,9 +280,18 @@
   <!-- 表单弹窗：添加/修改 -->
   <FileForm ref="FileRef" @success="handleUploadSuccess" />
 
-  <el-dialog v-model="dialogFormVisibleXlsxInfo" title="考点设置" width="70%">
+  <Dialog  v-model="dialogFormVisibleXlsxInfo" title="考点设置" width="70%">
     <input type="file" id="xlsxFile" accept=".xlsx" />
     <button @click="getXlsxDataInfo">文件解析</button>
+    <div
+      style="border: 1px solid #ddd; padding: 10px; margin: 10px 0; border-radius: 6px; max-height: 100%; overflow: hidden;"
+    >
+      <h3 style="margin: 0 0 8px 0;">试题内容：</h3>
+      <el-scrollbar height="200px">
+        <!-- 支持富文本渲染 -->
+        <div v-html="formData.content" style="white-space: pre-wrap;"></div>
+      </el-scrollbar>
+    </div>
     <div style="height: 400px; overflow: hidden; display: flex; gap: 16px">
       <div style="flex: 0.5; overflow: auto; border: 1px solid #eee; padding: 8px">
         <h3>考点</h3>
@@ -305,13 +314,25 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" width="100px">
+          <el-table-column label="操作" width="140px">
             <template #default="{ row }">
-              <span
+              <el-button
+                :icon="ArrowUp"
+                circle
+                size="small"
+                @click="moveUp(row)"
+                title="上移"
+              />
+              <el-button
+                :icon="ArrowDown"
+                circle
+                size="small"
+                @click="moveDown(row)"
+                title="下移"
+              />
+              <el-button
                 @click="removePoint(row)"
-                style="cursor: pointer; font-weight: bold; font-size: 18px"
-                title="点击删除"
-                >—</span
+                >—</el-button
               >
             </template>
           </el-table-column>
@@ -321,7 +342,7 @@
 
     <!-- <el-skeleton :rows="5" animated v-if="XlsxPointsList.length < 0 && isLoading" />
      -->
-  </el-dialog>
+  </Dialog>
   <el-dialog v-model="dialogFormVisibleXlsxInfos" :title="titles" width="300px">
     <el-tree
       style="max-width: 600px"
@@ -336,22 +357,42 @@
     <!-- 单元格类型才显示 -->
     <div v-if="isCellType" style="margin-bottom: 12px">
       <!-- 上方输入框和添加按钮 -->
-      <div style="display: flex; gap: 8px; margin-bottom: 8px">
-        <!-- 单个输入框（默认） -->
-        <el-input
-          v-if="selectedType !== 'range'"
-          v-model="cellInputValue"
-          :placeholder="getPlaceholder(selectedType)"
-          style="flex: 1"
-        />
-
-        <!-- 两个输入框，用冒号拼接 -->
-        <template v-else>
-          <el-input v-model="rangeStart" placeholder="开始单元格" style="flex: 1" />
-          <span>:</span>
-          <el-input v-model="rangeEnd" placeholder="结束单元格" style="flex: 1" />
+    <div style="display: flex; flex-direction: column; gap: 8px; margin-bottom: 8px;">
+        <!-- cell 类型：两个输入框 -->
+        <template v-if="selectedType === 'cell'">
+          <div style="display: flex; gap: 8px; align-items: center;">
+            <el-input
+              v-model="cellInputValue"
+              :placeholder="getPlaceholder(selectedType)"
+              style="flex: 1"
+            />
+            <el-button type="primary" @click="addCellValue">确定</el-button>
+          </div>
+          <el-input
+            v-model="cellImportValue"
+            placeholder="输入关键字"
+            style="flex: 1"
+            clearable
+          />
+        </template>
+
+        <!-- range 类型 -->
+        <template v-else-if="selectedType === 'range'">
+          <el-input v-model="rangeStart" placeholder="开始单元格 (如 A1)" style="flex: 1" />
+          <span>:</span>
+          <el-input v-model="rangeEnd" placeholder="结束单元格 (如 C5)" style="flex: 1" />
+          <el-button type="primary" @click="addCellValue">确定</el-button>
+        </template>
+
+        <!-- 其他类型 -->
+        <template v-else>
+          <el-input
+            v-model="cellInputValue"
+            :placeholder="getPlaceholder(selectedType)"
+            style="flex: 1"
+          />
+          <el-button type="primary" @click="addCellValue">确定</el-button>
         </template>
-        <el-button type="primary" @click="addCellValue">确定</el-button>
       </div>
 
       <!-- 下方列表（多选可删除） -->
@@ -386,13 +427,14 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import { FormRules } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
 import FileForm from './components/FileForm.vue'
-
+import { ArrowUp, ArrowDown, Delete } from '@element-plus/icons-vue'
 defineOptions({ name: 'WpsXlsxFrom' })
 const xlsxPointsList = ref<Tree[]>([]) // 树形结构
 const xlsxPointsInfoList = ref<Tree[]>([]) // 树形结构
 
 const isCellType = ref(false) // 是否单元格
 const cellInputValue = ref('') // 上方输入框值
+const cellImportValue = ref('') // 上方输入框值
 const cellValues = ref<{ value: string }[]>([]) // 存储所有添加的数据
 const selectedRows = ref<{ value: string }[]>([]) // 多选的行
 const rangeStart = ref('') // range 开始
@@ -496,6 +538,30 @@ interface XlsxPointsInfo {
   method?: string;
 }
 let xlsxPointsInfosList: XlsxPointsInfo[] = []
+  // 上移
+ function moveUp(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index > 0) {
+      [list.value[index - 1], list.value[index]] = [list.value[index], list.value[index - 1]];
+    }
+      updateSort()
+  }
+
+  // 下移
+ function moveDown(row) {
+    const index = list.value.findIndex(item => item === row);
+    if (index !== -1 && index < list.value.length - 1) {
+      [list.value[index + 1], list.value[index]] = [list.value[index], list.value[index + 1]];
+    }
+      updateSort()
+  }
+
+  // 更新 sort 字段
+const updateSort = () => {
+  list.value.forEach((item, index) => {
+    item.sort = index + 1
+  })
+}
 const removePoint = (row: any) => {
   for (let i = 0; i < list.value.length; i++) {
     if ((row.content ?? row.contentIn) == (list.value[i].content ?? list.value[i].contentIn)) {
@@ -547,9 +613,27 @@ const handleCheckChange = (data: any, _checked: boolean, _indeterminate: boolean
     examCode: '111',
     method: data.parameter ?? ''
   }
-  if (xlsxPoints.function) {
-    xlsxPointsInfosList.push(cloneDeep(xlsxPoints))
+    // 查找当前节点是否已存在于列表中（根据 function 或 examName 唯一标识）
+  const existIndex = xlsxPointsInfosList.findIndex(
+    (item) => item.function === xlsxPoints.function && item.examName === xlsxPoints.examName
+  )
+    if (_checked) {
+    // ✅ 选中时添加（若已存在则不重复添加）
+    if (existIndex === -1) {
+      xlsxPointsInfosList.push(cloneDeep(xlsxPoints))
+    }
+  } else {
+    // ❌ 取消选中时删除
+    if (existIndex !== -1) {
+      xlsxPointsInfosList.splice(existIndex, 1)
+    }
   }
+
+  console.log('📦 当前选中数据：', xlsxPointsInfosList)
+  // if (xlsxPoints.function) {
+  //   xlsxPointsInfosList.push(cloneDeep(xlsxPoints))
+  // }
+  
 }
 const file = ref<any>()
 // 获取xlsx文件，并使用文件流进行解析
@@ -584,6 +668,7 @@ const handleNodelClick = async (row: any) => {
     selectedType.value = row.type // 点击节点时更新
     cellInputValue.value = ''
     cellValues.value = [] // 新的 cell 节点清空数据
+    cellImportValue.value=''
   }
 
   console.log(row.index + 'row.indexrow.index')
@@ -620,12 +705,13 @@ const handleDelete = (row: any) => {
 }
 
 const submitXlsxPoints = async () => {
-  console.log('单元格输入内容:', cellValues.value)
+  console.log('单元格输入内容:', cellImportValue.value)
   console.log(xlsxPointsInfosList)
   const res = await XlsxApi.getXlsxMaster({
     data: JSON.stringify(xlsxPointsInfosList),
     file: file.value,
-    cell: cellValues.value.map((item) => item.value) // 提取值数组
+    cell: cellValues.value.map((item) => item.value), // 提取值数组
+    keyWords:cellImportValue.value
   })
   xlsxPointsInfosList = []
   console.log(res)
diff --git a/src/views/paper/question/index.vue b/src/views/paper/question/index.vue
index ddd5d46..1c7578b 100644
--- a/src/views/paper/question/index.vue
+++ b/src/views/paper/question/index.vue
@@ -20,15 +20,36 @@
           :inline="true"
           label-width="68px"
         >
-          <!--          <el-form-item label="用户名称" prop="username">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.username"-->
-          <!--              placeholder="请输入用户名称"-->
-          <!--              clearable-->
-          <!--              @keyup.enter="handleQuery"-->
-          <!--              class="!w-240px"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
+          <el-form-item label="试题编号" prop="quNum">
+              <el-input
+                v-model="queryParams.quNum"
+                placeholder="请输入试题编号"
+                clearable
+                @keyup.enter="handleQuery"
+                class="!w-240px"
+              />
+          </el-form-item>
+          <el-form-item label="题干" prop="content">
+              <el-input
+                v-model="queryParams.content"
+                placeholder="请输入题干"
+                clearable
+                @keyup.enter="handleQuery"
+                class="!w-240px"
+              />
+          </el-form-item>        
+          <el-form-item label="状态" prop="examStatus">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="请选择状态"
+              clearable
+              class="!w-240px"
+            >
+              <el-option label="启用" :value="0" />
+              <el-option label="禁用" :value="1" />
+            </el-select>
+          </el-form-item>
+        
           <!--          <el-form-item label="手机号码" prop="mobile">-->
           <!--            <el-input-->
           <!--              v-model="queryParams.mobile"-->
@@ -59,7 +80,7 @@
               <el-radio-button :label="''">全部</el-radio-button>
               <el-radio-button :label="'0'">审核通过</el-radio-button>
               <el-radio-button :label="'1'">未审核</el-radio-button>
-              <el-radio-button :label="'2'">待审核</el-radio-button>
+              <!-- <el-radio-button :label="'2'">待审核</el-radio-button> -->
               <el-radio-button :label="'3'">审核未通过</el-radio-button>
             </el-radio-group>
           </el-form-item>
@@ -75,7 +96,7 @@
           <!--          </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="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
             <el-button
               type="danger"
               class="ele-btn-del"
@@ -127,7 +148,15 @@
               plain
               @click="handleAuditTrue('True')"
             >
-              <Icon icon="ep:plus" /> 审核试题
+              <Icon icon="ep:check" /> 审核通过试题
+            </el-button>
+              <el-button
+              v-if="queryParams.audit === '1' && audioTrue"
+              type="primary"
+              plain
+              @click="handleAuditTrue('False')"
+            >
+              <Icon icon="ep:close-bold" /> 审核不通过试题
             </el-button>
             <el-button
               v-if="queryParams.audit === '' || queryParams.audit === '0'"
@@ -150,6 +179,11 @@
             prop="quNum"
             :show-overflow-tooltip="true"
           />
+          <el-table-column label="题干" align="center" prop="content" width="120">
+            <template #default="{ row }">
+                   {{ getFirstNChineseChars(row.content, 5) }}
+            </template>
+          </el-table-column>
           <el-table-column label="专业" align="center" prop="specialtyName" width="120" />
           <el-table-column
             label="课程"
@@ -233,12 +267,17 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column
-            label="创建时间"
+            :label="tenantId === 1 ? '创建时间' : '更新时间'"
             align="center"
-            prop="createTime"
-            :formatter="dateFormatter"
             width="180"
-          />
+          >
+            <template #default="scope">
+              <span>
+                {{ dateFormatter(scope.row, null, tenantId === 1 ? scope.row.createTime : scope.row.updateTime) }}
+              </span>
+            </template>
+          </el-table-column>
+
           <el-table-column label="操作" align="center" width="160">
             <template #default="scope">
               <div class="flex items-center justify-center">
@@ -372,9 +411,10 @@ import { handleTree } from '@/utils/tree'
 import * as SpecialtyApi from '@/api/points'
 import { useSettingStore } from '@/store/modules/settings'
 import { TaskStatusEnum } from '@/api/bpm/task'
+import { status } from 'nprogress'
 const settingStore = useSettingStore()
 defineOptions({ name: 'SystemUser' })
-
+const tenantId = getTenantId()
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -392,7 +432,10 @@ const queryParams = reactive({
   chapteridDictText: '',
   pageNo: 1,
   pageSize: 10,
-  audit: ''
+  audit: '',
+  status:'',
+  quNum:'',
+  content:''
 })
 const queryFormRef = ref() // 搜索的表单
 const specialtyList = ref<Tree[]>([]) // 树形结构
@@ -887,6 +930,24 @@ const handleRole = (row: UserApi.UserVO) => {
   assignRoleFormRef.value.open(row)
 }
 
+
+function getFirstNChineseChars(htmlStr) {
+  if (!htmlStr) return ''
+
+  // 将 HTML 转为纯文本
+  const tempDiv = document.createElement('div')
+  tempDiv.innerHTML = htmlStr
+  let text = tempDiv.textContent || tempDiv.innerText || ''
+
+  // 去掉空格和换行
+  text = text.replace(/\s+/g, '')
+
+  // 匹配汉字
+  const match = text.match(/[\u4e00-\u9fa5]/g)
+  if (!match) return ''
+
+  return match.slice(0, 6).join('')
+}
 /** 初始化 */
 onMounted(() => {
   getList()
diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue
index 7948f1d..31e4810 100644
--- a/src/views/system/tenant/TenantForm.vue
+++ b/src/views/system/tenant/TenantForm.vue
@@ -7,8 +7,8 @@
       :rules="formRules"
       label-width="120px"
     >
-      <el-form-item label="学校用户名" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入学校用户名" />
+      <el-form-item label="学校名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入学校名称" />
       </el-form-item>
       <el-form-item label="学校用户权限" prop="packageId">
         <el-select v-model="formData.packageId" clearable placeholder="请选择学校用户权限">
@@ -26,13 +26,13 @@
       <el-form-item label="联系手机" prop="contactMobile">
         <el-input v-model="formData.contactMobile" placeholder="请输入联系手机" />
       </el-form-item>
-      <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
-        <el-input v-model="formData.username" placeholder="请输入用户名称" />
+      <el-form-item v-if="formData.id === undefined" label="管理员账号" prop="username">
+        <el-input v-model="formData.username" placeholder="管理员账号" />
       </el-form-item>
-      <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+      <el-form-item v-if="formData.id === undefined" label="管理员密码" prop="password">
         <el-input
           v-model="formData.password"
-          placeholder="请输入用户密码"
+          placeholder="请输入管理员密码"
           show-password
           type="password"
         />
@@ -54,8 +54,8 @@
           value-format="x"
         />
       </el-form-item>
-      <el-form-item label="绑定域名" prop="website">
-        <el-input v-model="formData.website" placeholder="请输入绑定域名" />
+      <el-form-item label="绑定MAC地址" prop="website">
+        <el-input v-model="formData.website" placeholder="请输入绑定MAC地址" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -111,14 +111,14 @@ const formData = ref({
   password: undefined
 })
 const formRules = reactive({
-  name: [{ required: true, message: '学校用户名不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '学校名称不能为空', trigger: 'blur' }],
   packageId: [{ required: true, message: '学校用户权限不能为空', trigger: 'blur' }],
   contactName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
   expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }],
-  website: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }],
-  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
-  password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }]
+  website: [{ required: true, message: '绑定MAC地址不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '管理员账号不能为空', trigger: 'blur' }],
+  password: [{ required: true, message: '管理员密码不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const packageList = ref([] as TenantPackageApi.TenantPackageVO[]) // 租户套餐
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 566dfa0..504040e 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -10,10 +10,10 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="学校用户名" prop="name">
+      <el-form-item label="学校名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入学校用户名"
+          placeholder="请输入学校名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -125,7 +125,8 @@
         width="180"
         :formatter="dateFormatter"
       />
-      <el-table-column label="绑定域名" align="center" prop="website" width="180" />
+      <el-table-column label="绑定MAC地址" align="center" prop="website" width="180" />
+      <el-table-column label="管理员账号" align="center" prop="username" width="180" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@@ -138,20 +139,20 @@
         width="180"
         :formatter="dateFormatter"
       />
-      <el-table-column
+      <!-- <el-table-column
           label="连接状态（需点击状态刷新）"
           align="center"
           prop="websiteStatus"
           width="180"
-      />
+      /> -->
       <el-table-column label="操作" align="center" min-width="110" fixed="right">
         <template #default="scope">
           <el-button
               link
               type="primary"
-              @click="openStatus(scope.row)"
+              @click="setPassword(scope.row.contactUserId)"
           >
-            状态
+            重置密码
           </el-button>
           <el-button
             link
@@ -260,6 +261,55 @@ const openStatus = (row: any) => {
     }
   })
 }
+  const setPassword = async (id) => {
+  if (!id) return
+
+  try {
+    // 1️⃣ 弹出输入框，让管理员输入新密码
+    const { value: newPassword } = await ElMessageBox.prompt('请输入新的密码：', '重置密码', {
+      confirmButtonText: '下一步',
+      cancelButtonText: '取消',
+      inputType: 'password',
+      inputPlaceholder: '请输入新密码',
+      inputValidator: (val) => {
+        if (!val) return '密码不能为空'
+        if (val.length < 4) return '密码至少 4 位'
+        return true
+      },
+    })
+
+    // 2️⃣ 再次确认是否要重置
+    await ElMessageBox.confirm(
+      `确认将该用户密码重置为：${newPassword}？`,
+      '确认操作',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    )
+
+    // 3️⃣ 调用后端接口发请求
+    const data = {
+      id,
+      password: newPassword,
+    }
+    const res = await TenantApi.resetPassword(data) d
+
+    // 4️⃣ 显示成功提示
+    ElMessage.success(res?.msg || '密码重置成功！')
+
+  } catch (err) {
+    if (err === 'cancel' || err === 'close') {
+      // 用户取消操作
+      return
+    }
+    console.error('重置密码失败：', err)
+    ElMessage.error('操作失败，请重试')
+  }
+}
+
+
 /** 获取时分秒 */
 const getTimeWithAmPm = (): string => {
   const now = new Date()
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 805c5f3..8faf6ef 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
@@ -27,6 +27,16 @@
         />
       </el-form-item>
 
+      <!-- 顶部全选复选框 -->
+      <el-checkbox
+        v-model="checkAllStatus"
+        :indeterminate="isIndeterminate"
+        @change="handleCheckAllChange"
+        :disabled="isChoice"
+      >
+        全选
+      </el-checkbox>
+
       <!-- 题型 -->
       <el-form-item label="题型" prop="spName">
         <el-select v-model="form.spName" placeholder="请选择题型" clearable :disabled="isUpdate">
@@ -305,6 +315,24 @@ const calcSubtotal = () => {
   form.value.subtotalScore = n * s
 }
 
+const isChoice = ref(false); // 示例状态
+const checkAllStatus = ref(true);
+const isIndeterminate = ref(false);
+//  点击“全选/全不选”复选框
+const handleCheckAllChange = async () => {
+  await nextTick() // 等树加载完成再执行，避免空指针
+  if (!treeRef.value) return
+  if (checkAllStatus.value) {
+  const allKeys = getAllTreeKeys(pointOptions.value).map(String)
+  form.value.pointName = allKeys
+  treeRef.value?.setCheckedKeys(allKeys)
+  } else {
+     form.value.pointName = [] 
+    treeRef.value.setCheckedKeys([])
+  }
+  isIndeterminate.value = false
+}
+
 /** 选中回调 */
 const handleCheckChange = () => {
   form.value.pointName = treeRef.value.getCheckedKeys()
diff --git a/src/views/task/exam/components/steps/step4/components/step-edit.vue b/src/views/task/exam/components/steps/step4/components/step-edit.vue
index b1ccbac..9f5c889 100644
--- a/src/views/task/exam/components/steps/step4/components/step-edit.vue
+++ b/src/views/task/exam/components/steps/step4/components/step-edit.vue
@@ -12,13 +12,13 @@
       label-width="120px"
       @submit.prevent=""
     >
-      <el-form-item label="试卷ID" prop="taskId">
+      <!-- <el-form-item label="试卷ID" prop="taskId">
         <el-input clearable v-model="form.taskId" placeholder="请输入试卷ID" disabled/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="批次" prop="batch">
+      <!-- <el-form-item label="批次" prop="batch">
         <el-input clearable v-model="form.batch" placeholder="请输入批次" disabled/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="考试时长" prop="answerTime">
       <el-time-picker
         v-model="form.answerTime"
diff --git a/src/views/task/exam/components/task-add.vue b/src/views/task/exam/components/task-add.vue
index f117a95..73860f7 100644
--- a/src/views/task/exam/components/task-add.vue
+++ b/src/views/task/exam/components/task-add.vue
@@ -55,6 +55,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否共享" prop="share">
+        <el-radio-group v-model="form.share">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="handleCancel">取消</el-button>
@@ -103,7 +114,8 @@ const [form, resetFields, assignFields] = useFormData({
   updateTime: '',
   updateBy: '',
   deptId: '',
-  userId: ''
+  userId: '',
+  share:1
 })
 
 /** 表单验证规则 */
diff --git a/src/views/task/exam/components/task-temp.vue b/src/views/task/exam/components/task-temp.vue
index 1b2672e..332b74c 100644
--- a/src/views/task/exam/components/task-temp.vue
+++ b/src/views/task/exam/components/task-temp.vue
@@ -76,7 +76,7 @@ const queryParams = reactive({
   pageSize: 10,
   status: '0',
   isTemplate: '0',
-  taskType:'1'
+ 
 });
 
 // 获取数据
diff --git a/src/views/task/exam/index.vue b/src/views/task/exam/index.vue
index 8ed3c8b..007b9d1 100644
--- a/src/views/task/exam/index.vue
+++ b/src/views/task/exam/index.vue
@@ -84,6 +84,11 @@
           <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
         </template>
       </el-table-column>
+      <el-table-column label="是否共享" align="center" prop="share" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.share" />
+        </template>
+      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" width="120">
     <template #default="scope">
       <el-switch
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 b270edd..a6157a3 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
@@ -27,6 +27,16 @@
         />
       </el-form-item>
 
+      <!-- 顶部全选复选框 -->
+      <el-checkbox
+        v-model="checkAllStatus"
+        :indeterminate="isIndeterminate"
+        @change="handleCheckAllChange"
+        :disabled="isChoice"
+      >
+        全选
+      </el-checkbox>
+
       <!-- 题型 -->
       <el-form-item label="题型" prop="spName">
         <el-select v-model="form.spName" placeholder="请选择题型" clearable :disabled="isUpdate">
@@ -305,6 +315,24 @@ const calcSubtotal = () => {
   form.value.subtotalScore = n * s
 }
 
+const isChoice = ref(false); // 示例状态
+const checkAllStatus = ref(true);
+const isIndeterminate = ref(false);
+//  点击“全选/全不选”复选框
+const handleCheckAllChange = async () => {
+  await nextTick() // 等树加载完成再执行，避免空指针
+  if (!treeRef.value) return
+  if (checkAllStatus.value) {
+  const allKeys = getAllTreeKeys(pointOptions.value).map(String)
+  form.value.pointName = allKeys
+  treeRef.value?.setCheckedKeys(allKeys)
+  } else {
+     form.value.pointName = [] 
+    treeRef.value.setCheckedKeys([])
+  }
+  isIndeterminate.value = false
+}
+
 /** 选中回调 */
 const handleCheckChange = () => {
   form.value.pointName = treeRef.value.getCheckedKeys()
diff --git a/src/views/task/selftrans/collegeexam/components/steps/step4/components/step-edit.vue b/src/views/task/selftrans/collegeexam/components/steps/step4/components/step-edit.vue
index 7eb21a9..77afe39 100644
--- a/src/views/task/selftrans/collegeexam/components/steps/step4/components/step-edit.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step4/components/step-edit.vue
@@ -12,13 +12,13 @@
       label-width="120px"
       @submit.prevent=""
     >
-      <el-form-item label="试卷ID" prop="taskId">
+      <!-- <el-form-item label="试卷ID" prop="taskId">
         <el-input clearable v-model="form.taskId" placeholder="请输入试卷ID" disabled/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="批次" prop="batch">
+      <!-- <el-form-item label="批次" prop="batch">
         <el-input clearable v-model="form.batch" placeholder="请输入批次" disabled/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="考试时长" prop="answerTime">
       <el-time-picker
         v-model="form.answerTime"
diff --git a/src/views/task/selftrans/collegeexam/components/task-add.vue b/src/views/task/selftrans/collegeexam/components/task-add.vue
index 1a72611..85875de 100644
--- a/src/views/task/selftrans/collegeexam/components/task-add.vue
+++ b/src/views/task/selftrans/collegeexam/components/task-add.vue
@@ -55,6 +55,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否共享" prop="share">
+        <el-radio-group v-model="form.share">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="handleCancel">取消</el-button>
@@ -103,7 +114,8 @@ const [form, resetFields, assignFields] = useFormData({
   updateTime: '',
   updateBy: '',
   deptId: '',
-  userId: ''
+  userId: '',
+  share:1
 })
 
 /** 表单验证规则 */
diff --git a/src/views/task/selftrans/collegeexam/components/task-temp.vue b/src/views/task/selftrans/collegeexam/components/task-temp.vue
index 0d1cb83..19772d5 100644
--- a/src/views/task/selftrans/collegeexam/components/task-temp.vue
+++ b/src/views/task/selftrans/collegeexam/components/task-temp.vue
@@ -76,7 +76,6 @@ const queryParams = reactive({
   pageSize: 10,
   status: '0',
   isTemplate: '0',
-  taskType:'2'
 });
 
 // 获取数据
diff --git a/src/views/task/selftrans/collegeexam/index.vue b/src/views/task/selftrans/collegeexam/index.vue
index d105b0f..f5b0b00 100644
--- a/src/views/task/selftrans/collegeexam/index.vue
+++ b/src/views/task/selftrans/collegeexam/index.vue
@@ -85,6 +85,11 @@
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
         </template>
+      </el-table-column>
+       <el-table-column label="是否共享" align="center" prop="share" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.share" />
+        </template>
       </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" width="120">
     <template #default="scope">
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 67d3184..dd20e78 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
@@ -27,6 +27,16 @@
         />
       </el-form-item>
 
+      <!-- 顶部全选复选框 -->
+      <el-checkbox
+        v-model="checkAllStatus"
+        :indeterminate="isIndeterminate"
+        @change="handleCheckAllChange"
+        :disabled="isChoice"
+      >
+        全选
+      </el-checkbox>
+
       <!-- 题型 -->
       <el-form-item label="题型" prop="spName">
         <el-select v-model="form.spName" placeholder="请选择题型" clearable :disabled="isUpdate">
@@ -306,6 +316,26 @@ const calcSubtotal = () => {
   form.value.subtotalScore = n * s
 }
 
+const isChoice = ref(false); // 示例状态
+const checkAllStatus = ref(true);
+const isIndeterminate = ref(false);
+//  点击“全选/全不选”复选框
+const handleCheckAllChange = async () => {
+  await nextTick() // 等树加载完成再执行，避免空指针
+  if (!treeRef.value) return
+  if (checkAllStatus.value) {
+  const allKeys = getAllTreeKeys(pointOptions.value).map(String)
+  form.value.pointName = allKeys
+  treeRef.value?.setCheckedKeys(allKeys)
+  } else {
+     form.value.pointName = [] 
+    treeRef.value.setCheckedKeys([])
+  }
+  isIndeterminate.value = false
+}
+
+
+
 /** 选中回调 */
 const handleCheckChange = () => {
   form.value.pointName = treeRef.value.getCheckedKeys()
diff --git a/src/views/task/selftrans/module/components/steps/step4/components/step-edit.vue b/src/views/task/selftrans/module/components/steps/step4/components/step-edit.vue
index 6d751f4..67b1ba6 100644
--- a/src/views/task/selftrans/module/components/steps/step4/components/step-edit.vue
+++ b/src/views/task/selftrans/module/components/steps/step4/components/step-edit.vue
@@ -12,13 +12,13 @@
       label-width="120px"
       @submit.prevent=""
     >
-      <el-form-item label="试卷ID" prop="taskId">
+      <!-- <el-form-item label="试卷ID" prop="taskId">
         <el-input clearable v-model="form.taskId" placeholder="请输入试卷ID" disabled/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="批次" prop="batch">
+      <!-- <el-form-item label="批次" prop="batch">
         <el-input clearable v-model="form.batch" placeholder="请输入批次" disabled/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="考试时长" prop="answerTime">
       <el-time-picker
         v-model="form.answerTime"
diff --git a/src/views/task/selftrans/module/components/task-add.vue b/src/views/task/selftrans/module/components/task-add.vue
index 5cf5a22..abf0aa6 100644
--- a/src/views/task/selftrans/module/components/task-add.vue
+++ b/src/views/task/selftrans/module/components/task-add.vue
@@ -55,6 +55,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否共享" prop="share">
+        <el-radio-group v-model="form.share">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="handleCancel">取消</el-button>
@@ -103,7 +114,8 @@ const [form, resetFields, assignFields] = useFormData({
   updateTime: '',
   updateBy: '',
   deptId: '',
-  userId: ''
+  userId: '',
+  share:1
 })
 
 /** 表单验证规则 */
diff --git a/src/views/task/selftrans/module/components/task-temp.vue b/src/views/task/selftrans/module/components/task-temp.vue
index 1cb7c5e..19772d5 100644
--- a/src/views/task/selftrans/module/components/task-temp.vue
+++ b/src/views/task/selftrans/module/components/task-temp.vue
@@ -76,7 +76,6 @@ const queryParams = reactive({
   pageSize: 10,
   status: '0',
   isTemplate: '0',
-  taskType:'5'
 });
 
 // 获取数据
diff --git a/src/views/task/selftrans/module/index.vue b/src/views/task/selftrans/module/index.vue
index d566497..aa5fb77 100644
--- a/src/views/task/selftrans/module/index.vue
+++ b/src/views/task/selftrans/module/index.vue
@@ -86,6 +86,11 @@
           <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
         </template>
       </el-table-column>
+      <el-table-column label="是否共享" align="center" prop="share" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.share" />
+        </template>
+      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" width="120">
     <template #default="scope">
       <el-switch
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 a7f6885..9d4a6df 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
@@ -27,6 +27,16 @@
         />
       </el-form-item>
 
+      <!-- 顶部全选复选框 -->
+      <el-checkbox
+        v-model="checkAllStatus"
+        :indeterminate="isIndeterminate"
+        @change="handleCheckAllChange"
+        :disabled="isChoice"
+      >
+        全选
+      </el-checkbox>
+
       <!-- 题型 -->
       <el-form-item label="题型" prop="spName">
         <el-select v-model="form.spName" placeholder="请选择题型" clearable :disabled="isUpdate">
@@ -304,6 +314,24 @@ const calcSubtotal = () => {
   form.value.subtotalScore = n * s
 }
 
+const isChoice = ref(false); // 示例状态
+const checkAllStatus = ref(true);
+const isIndeterminate = ref(false);
+//  点击“全选/全不选”复选框
+const handleCheckAllChange = async () => {
+  await nextTick() // 等树加载完成再执行，避免空指针
+  if (!treeRef.value) return
+console.log(checkAllStatus.value+"checkAllStatus.value")
+  if (checkAllStatus.value) {
+  const allKeys = getAllTreeKeys(pointOptions.value).map(String)
+  form.value.pointName = allKeys
+  treeRef.value?.setCheckedKeys(allKeys)
+  } else {
+     form.value.pointName = [] 
+    treeRef.value.setCheckedKeys([])
+  }
+  isIndeterminate.value = false
+}
 /** 选中回调 */
 const handleCheckChange = () => {
   form.value.pointName = treeRef.value.getCheckedKeys()
diff --git a/src/views/task/selftrans/random/components/steps/step4/components/step-edit.vue b/src/views/task/selftrans/random/components/steps/step4/components/step-edit.vue
index 6d751f4..67b1ba6 100644
--- a/src/views/task/selftrans/random/components/steps/step4/components/step-edit.vue
+++ b/src/views/task/selftrans/random/components/steps/step4/components/step-edit.vue
@@ -12,13 +12,13 @@
       label-width="120px"
       @submit.prevent=""
     >
-      <el-form-item label="试卷ID" prop="taskId">
+      <!-- <el-form-item label="试卷ID" prop="taskId">
         <el-input clearable v-model="form.taskId" placeholder="请输入试卷ID" disabled/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="批次" prop="batch">
+      <!-- <el-form-item label="批次" prop="batch">
         <el-input clearable v-model="form.batch" placeholder="请输入批次" disabled/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="考试时长" prop="answerTime">
       <el-time-picker
         v-model="form.answerTime"
diff --git a/src/views/task/selftrans/random/components/task-add.vue b/src/views/task/selftrans/random/components/task-add.vue
index 724a1de..8744b34 100644
--- a/src/views/task/selftrans/random/components/task-add.vue
+++ b/src/views/task/selftrans/random/components/task-add.vue
@@ -55,6 +55,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否共享" prop="share">
+        <el-radio-group v-model="form.share">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="handleCancel">取消</el-button>
@@ -103,7 +114,8 @@ const [form, resetFields, assignFields] = useFormData({
   updateTime: '',
   updateBy: '',
   deptId: '',
-  userId: ''
+  userId: '',
+  share:1
 })
 
 /** 表单验证规则 */
diff --git a/src/views/task/selftrans/random/components/task-temp.vue b/src/views/task/selftrans/random/components/task-temp.vue
index cc63fdb..19772d5 100644
--- a/src/views/task/selftrans/random/components/task-temp.vue
+++ b/src/views/task/selftrans/random/components/task-temp.vue
@@ -76,7 +76,6 @@ const queryParams = reactive({
   pageSize: 10,
   status: '0',
   isTemplate: '0',
-  taskType:'4'
 });
 
 // 获取数据
diff --git a/src/views/task/selftrans/random/index.vue b/src/views/task/selftrans/random/index.vue
index eb32d19..11e6138 100644
--- a/src/views/task/selftrans/random/index.vue
+++ b/src/views/task/selftrans/random/index.vue
@@ -86,6 +86,11 @@
           <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
         </template>
       </el-table-column>
+      <el-table-column label="是否共享" align="center" prop="share" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.share" />
+        </template>
+      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" width="120">
     <template #default="scope">
       <el-switch
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 db38616..d6d7703 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
@@ -26,6 +26,15 @@
           @check="handleCheckChange"
         />
       </el-form-item>
+      <!-- 顶部全选复选框 -->
+      <el-checkbox
+        v-model="checkAllStatus"
+        :indeterminate="isIndeterminate"
+        @change="handleCheckAllChange"
+        :disabled="isChoice"
+      >
+        全选
+      </el-checkbox>
 
       <!-- 题型 -->
       <el-form-item label="题型" prop="spName">
@@ -306,6 +315,26 @@ const calcSubtotal = () => {
   form.value.subtotalScore = n * s
 }
 
+
+const isChoice = ref(false); // 示例状态
+const checkAllStatus = ref(true);
+const isIndeterminate = ref(false);
+//  点击“全选/全不选”复选框
+const handleCheckAllChange = async () => {
+  await nextTick() // 等树加载完成再执行，避免空指针
+  if (!treeRef.value) return
+console.log(checkAllStatus.value+"checkAllStatus.value")
+  if (checkAllStatus.value) {
+  const allKeys = getAllTreeKeys(pointOptions.value).map(String)
+  form.value.pointName = allKeys
+  treeRef.value?.setCheckedKeys(allKeys)
+  } else {
+     form.value.pointName = [] 
+    treeRef.value.setCheckedKeys([])
+  }
+  isIndeterminate.value = false
+}
+
 /** 选中回调 */
 const handleCheckChange = () => {
   form.value.pointName = treeRef.value.getCheckedKeys()
diff --git a/src/views/task/sprint/components/steps/step4/components/step-edit.vue b/src/views/task/sprint/components/steps/step4/components/step-edit.vue
index 6d751f4..67b1ba6 100644
--- a/src/views/task/sprint/components/steps/step4/components/step-edit.vue
+++ b/src/views/task/sprint/components/steps/step4/components/step-edit.vue
@@ -12,13 +12,13 @@
       label-width="120px"
       @submit.prevent=""
     >
-      <el-form-item label="试卷ID" prop="taskId">
+      <!-- <el-form-item label="试卷ID" prop="taskId">
         <el-input clearable v-model="form.taskId" placeholder="请输入试卷ID" disabled/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="批次" prop="batch">
+      <!-- <el-form-item label="批次" prop="batch">
         <el-input clearable v-model="form.batch" placeholder="请输入批次" disabled/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="考试时长" prop="answerTime">
       <el-time-picker
         v-model="form.answerTime"
diff --git a/src/views/task/sprint/components/task-add.vue b/src/views/task/sprint/components/task-add.vue
index 64b7d43..082b818 100644
--- a/src/views/task/sprint/components/task-add.vue
+++ b/src/views/task/sprint/components/task-add.vue
@@ -54,6 +54,17 @@
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
+      </el-form-item>
+            <el-form-item label="是否共享" prop="share">
+        <el-radio-group v-model="form.share">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -103,7 +114,8 @@ const [form, resetFields, assignFields] = useFormData({
   updateTime: '',
   updateBy: '',
   deptId: '',
-  userId: ''
+  userId: '',
+  share: 1
 })
 
 /** 表单验证规则 */
diff --git a/src/views/task/sprint/components/task-temp.vue b/src/views/task/sprint/components/task-temp.vue
index 0499b01..19772d5 100644
--- a/src/views/task/sprint/components/task-temp.vue
+++ b/src/views/task/sprint/components/task-temp.vue
@@ -76,7 +76,6 @@ const queryParams = reactive({
   pageSize: 10,
   status: '0',
   isTemplate: '0',
-  taskType:'3'
 });
 
 // 获取数据
diff --git a/src/views/task/sprint/index.vue b/src/views/task/sprint/index.vue
index d922d0e..50c29fb 100644
--- a/src/views/task/sprint/index.vue
+++ b/src/views/task/sprint/index.vue
@@ -86,6 +86,11 @@
           <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
         </template>
       </el-table-column>
+      <el-table-column label="是否共享" align="center" prop="share" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.share" />
+        </template>
+      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" width="120">
     <template #default="scope">
       <el-switch
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 372255c..e154483 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
@@ -26,6 +26,15 @@
           @check="handleCheckChange"
         />
       </el-form-item>
+      <!-- 顶部全选复选框 -->
+      <el-checkbox
+        v-model="checkAllStatus"
+        :indeterminate="isIndeterminate"
+        @change="handleCheckAllChange"
+        :disabled="isChoice"
+      >
+        全选
+      </el-checkbox>
 
       <!-- 题型 -->
       <el-form-item label="题型" prop="spName">
@@ -305,6 +314,26 @@ const calcSubtotal = () => {
   form.value.subtotalScore = n * s
 }
 
+const isChoice = ref(false); // 示例状态
+const checkAllStatus = ref(true);
+const isIndeterminate = ref(false);
+//  点击“全选/全不选”复选框
+const handleCheckAllChange = async () => {
+  await nextTick() // 等树加载完成再执行，避免空指针
+  if (!treeRef.value) return
+console.log(checkAllStatus.value+"checkAllStatus.value")
+  if (checkAllStatus.value) {
+  const allKeys = getAllTreeKeys(pointOptions.value).map(String)
+  form.value.pointName = allKeys
+  treeRef.value?.setCheckedKeys(allKeys)
+  } else {
+     form.value.pointName = [] 
+    treeRef.value.setCheckedKeys([])
+  }
+  isIndeterminate.value = false
+}
+
+
 /** 选中回调 */
 const handleCheckChange = () => {
   form.value.pointName = treeRef.value.getCheckedKeys()
diff --git a/src/views/task/trans/components/steps/step4/components/step-edit.vue b/src/views/task/trans/components/steps/step4/components/step-edit.vue
index 8e431a8..f92cb3d 100644
--- a/src/views/task/trans/components/steps/step4/components/step-edit.vue
+++ b/src/views/task/trans/components/steps/step4/components/step-edit.vue
@@ -12,13 +12,13 @@
       label-width="120px"
       @submit.prevent=""
     >
-      <el-form-item label="试卷ID" prop="taskId">
+      <!-- <el-form-item label="试卷ID" prop="taskId">
         <el-input clearable v-model="form.taskId" placeholder="请输入试卷ID" disabled/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="批次" prop="batch">
+      <!-- <el-form-item label="批次" prop="batch">
         <el-input clearable v-model="form.batch" placeholder="请输入批次" disabled/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="考试时长" prop="answerTime">
       <el-time-picker
         v-model="form.answerTime"
diff --git a/src/views/task/trans/components/task-add.vue b/src/views/task/trans/components/task-add.vue
index c4b3316..cb71e7a 100644
--- a/src/views/task/trans/components/task-add.vue
+++ b/src/views/task/trans/components/task-add.vue
@@ -55,6 +55,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否共享" prop="share">
+        <el-radio-group v-model="form.share">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="handleCancel">取消</el-button>
@@ -102,7 +113,8 @@ const [form, resetFields, assignFields] = useFormData({
   updateTime: '',
   updateBy: '',
   deptId: '',
-  userId: ''
+  userId: '',
+  share: 1
 })
 
 /** 表单验证规则 */
diff --git a/src/views/task/trans/components/task-temp.vue b/src/views/task/trans/components/task-temp.vue
index 7371b5d..472e8ff 100644
--- a/src/views/task/trans/components/task-temp.vue
+++ b/src/views/task/trans/components/task-temp.vue
@@ -76,7 +76,6 @@ const queryParams = reactive({
   pageSize: 10,
   status: '0',
   isTemplate: '0',
-  taskType:'0'
 });
 
 // 获取数据
diff --git a/src/views/task/trans/index.vue b/src/views/task/trans/index.vue
index f9f17b5..b3001c5 100644
--- a/src/views/task/trans/index.vue
+++ b/src/views/task/trans/index.vue
@@ -86,6 +86,11 @@
           <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
         </template>
       </el-table-column>
+      <el-table-column label="是否共享" align="center" prop="share" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.share" />
+        </template>
+      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="status" width="120">
     <template #default="scope">
       <el-switch
-- 
2.49.1


From 6ddd4a92cb77300b394e9c90c4899ba5572a1445 Mon Sep 17 00:00:00 2001
From: huababa1 <2037205722@qq.com>
Date: Thu, 16 Oct 2025 19:16:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E6=8C=89=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=8C=89=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 504040e..7b9d4a9 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -294,7 +294,7 @@ const openStatus = (row: any) => {
       id,
       password: newPassword,
     }
-    const res = await TenantApi.resetPassword(data) d
+    const res = await TenantApi.resetPassword(data) 
 
     // 4️⃣ 显示成功提示
     ElMessage.success(res?.msg || '密码重置成功！')
-- 
2.49.1