Accept Merge Request #85: (hyc -> master)

Merge Request: 【修改】页面细节 Created By: @华允传 Accepted By: @华允传 URL: https://g-iswv8783.coding.net/p/education/d/pengchen-ui-exam-vue3/git/merge/85?initial=true
2025-05-27 20:12:04 +08:00
parent 4f055f607e 80ea33e2cd
commit e359effbb5
14 changed files with 72 additions and 63 deletions
--- a/src/api/paper/question/index.ts
+++ b/src/api/paper/question/index.ts
@@ -41,9 +41,12 @@ export const getBankList = () => {
 }

 // 删除试题
-export const removeQuestion = (ids: string[]) => {
+export const removeQuestions = (ids) => {
  return request.delete({ url: '/exam/question/' + ids})
 }
+export async function removeQuestion(id) {
+  return await request.delete({ url: '/exam/question/' + id })
+}

 // 新增试题
 export function addQuestion(data: any) {
@@ -55,6 +58,12 @@ export function editQuestion(data: any) {
  return request.put({url: '/exam/question', data});
 }

+export function editQuestionNoAudit(data: any) {
+  return request.put({url: '/exam/question/NoAudit', data});
+}
+
+
+

 export const getQuestionExamineList = (params: QuestionQueryVO) => {
   return request.get({ url: '/exam/question/auditList', params })
--- a/src/views/paper/audit/ChoiceForm.vue
+++ b/src/views/paper/audit/ChoiceForm.vue
@@ -16,23 +16,11 @@
                  <el-input v-model="formData.specialtyName" placeholder="请输入专业" disabled/>
                </el-form-item>
              </el-col>
-              <el-col :span="12">
-                <el-form-item label="试题名称" prop="quBankName">
-                  <el-input v-model="formData.quBankName" placeholder="请试题名称" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
+               <el-col :span="12">
                <el-form-item label="课程" prop="courseName">
                  <el-input v-model="formData.courseName" placeholder="请输入课程" disabled/>
                </el-form-item>
              </el-col>
-              <el-col :span="12">
-                <el-form-item label="题库" prop="required">
-                  <el-input v-model="formData.required" placeholder="请选择题库" />
-                </el-form-item>
-              </el-col>
            </el-row>
            <el-row>
              <el-col :span="12">
@@ -42,7 +30,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="章节名称" prop="chapteridDictText">
-                  <el-input v-model="formData.chapteridDictText" placeholder="请输入章节名称" />
+                  <el-input v-model="formData.chapteridDictText" placeholder="请输入章节名称" disabled />
                </el-form-item>
              </el-col>
            </el-row>
@@ -52,39 +40,24 @@
                  <el-input v-model="formData.pointNames" placeholder="请输入知识点" disabled/>
                </el-form-item>
              </el-col>
-              <el-col :span="12">
-                <el-form-item label="审核状态" prop="audit">
-                  <el-input v-model="formData.audit" placeholder="请输入审核状态" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
+                <el-col :span="12">
                <el-form-item label="题型" prop="subjectName">
                  <el-input v-model="formData.subjectName" placeholder="请输入题型" disabled/>
                </el-form-item>
              </el-col>
-              <el-col :span="12">
-                <el-form-item label="启用状态" prop="status">
-                  <el-radio-group v-model="formData.status">
-                    <el-radio
-                      v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-                      :key="dict.value"
-                      :value="dict.value"
-                    >
-                      {{ dict.label }}
-                    </el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
            </el-row>
            <el-row>
+             
              <el-col :span="12">
-                <el-form-item label="来源" prop="resourceValue">
-                  <el-input v-model="formData.resourceValue" placeholder="请输入来源" />
-                </el-form-item>
+                <el-form-item label="启用状态" prop="status">
+                <el-radio-group v-model="formData.status">
+                  <el-radio :label="'0'">启用</el-radio>
+                  <el-radio :label="'1'">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
              </el-col>
            </el-row>
+       
          </el-form>
          <div class="edit-bottom">
            <div class="edit-left bottom-common">
@@ -450,7 +423,7 @@ const submitForm = async () => {
        await QuestionApi.addQuestion(data)
        message.success(t('common.createSuccess'))
      } else {
-        await QuestionApi.editQuestion(data)
+        await QuestionApi.editQuestionNoAudit(data)
        message.success(t('common.updateSuccess'))
      }
      dialogVisible.value = false
--- a/src/views/paper/audit/index.vue
+++ b/src/views/paper/audit/index.vue
@@ -83,7 +83,7 @@
            filterable
            allow-create
            default-first-option
-            placeholder="请选择同步服务器"
+            placeholder="请选择服务器"
            class="!w-240px"
        >
          <el-option
@@ -262,17 +262,17 @@
                <el-button
                  type="primary"
                  link
-                  @click="openForm('update', scope.row.quId)"
+                  @click="openForm('update', scope.row)"
                >
                  <Icon icon="ep:edit" />修改
                </el-button>
-                <el-button
+                <!-- <el-button
                  type="primary"
                  link
                  @click="openForm('update', scope.row.quId)"
                >
                  <Icon icon="ep:delete" />删除
-                </el-button>
+                </el-button> -->
              </div>
            </template>
          </el-table-column>
@@ -624,7 +624,7 @@ const findNamePathFromTreeList = (treeList: Tree[], targetId: number): string[]
 /** 添加/修改操作 */
 const formRef = ref()
 const cformRef = ref()
-const openForm = (type: string, id?: number) => {
+const openForm = (type: string, row: any) => {
  console.log(queryParams)
  // if (queryParams.subjectName == "") {
  //   return message.confirm('请选择题型！');
@@ -634,7 +634,7 @@ const openForm = (type: string, id?: number) => {
  // } else {
  //   formRef.value.open(queryParams, type, id)
  // }
-  formRef.value.open(queryParams, type, id)
+  formRef.value.open(queryParams, type, row.quId)
 }

 /** 用户导入 */
--- a/src/views/paper/question/BrowerForm.vue
+++ b/src/views/paper/question/BrowerForm.vue
@@ -322,7 +322,7 @@
                  <template #label>
                    <div class="custom-tabs-label">
                      <p>试题附件</p>
-                      <el-dropdown>
+                      <!-- <el-dropdown>
                        <span class="el-dropdown-link" @click.stop="false">
                          <div class="setting_icon"></div>
                        </span>
@@ -335,7 +335,7 @@
                            <el-dropdown-item>帮助</el-dropdown-item>
                          </el-dropdown-menu>
                        </template>
-                      </el-dropdown>
+                      </el-dropdown> -->
                    </div>
                  </template>
                  <!-- 提示 -->
--- a/src/views/paper/question/FileForm.vue
+++ b/src/views/paper/question/FileForm.vue
@@ -322,7 +322,7 @@
                  <template #label>
                    <div class="custom-tabs-label">
                      <p>试题附件</p>
-                      <el-dropdown>
+                      <!-- <el-dropdown>
                        <span class="el-dropdown-link" @click.stop="false">
                          <div class="setting_icon"></div>
                        </span>
@@ -335,7 +335,7 @@
                            <el-dropdown-item>帮助</el-dropdown-item>
                          </el-dropdown-menu>
                        </template>
-                      </el-dropdown>
+                      </el-dropdown> -->
                    </div>
                  </template>
                  <!-- 提示 -->
--- a/src/views/paper/question/MysqlForm.vue
+++ b/src/views/paper/question/MysqlForm.vue
@@ -319,7 +319,7 @@
                  <template #label>
                    <div class="custom-tabs-label">
                      <p>试题附件</p>
-                      <el-dropdown>
+                      <!-- <el-dropdown>
                        <span class="el-dropdown-link" @click.stop="false">
                          <div class="setting_icon"></div>
                        </span>
@@ -332,7 +332,7 @@
                            <el-dropdown-item>帮助</el-dropdown-item>
                          </el-dropdown-menu>
                        </template>
-                      </el-dropdown>
+                      </el-dropdown> -->
                    </div>
                  </template>
                  <!-- 提示 -->
--- a/src/views/paper/question/index.vue
+++ b/src/views/paper/question/index.vue
@@ -74,9 +74,17 @@
 <!--            />-->
 <!--          </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
+            <!-- <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"
+          :disabled="!selections.length"
+          @click="handleDeletes()"
+        >
+          批量删除
+        </el-button>
+          <el-button
          type="warning"
          plain
          @click="handleImport"
@@ -746,13 +754,32 @@ const handleDelete = async (id: number) => {
    // 删除的二次确认
    await message.delConfirm()
    // 发起删除
-    await UserApi.deleteUser(id)
+    await QuestionApi.removeQuestions(id)
    message.success(t('common.delSuccess'))
    // 刷新列表
    await getList()
  } catch {}
 }

+const handleDeletes = async () => {
+  try {
+    const rows = selections.value;
+  if (!rows.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+
+  selectedRows.value = rows.map((d: any) => d.quId); // 保存选中的行数据
+  await QuestionApi.removeQuestions(selectedRows.value)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+
+
 /** 重置密码 */
 const handleResetPwd = async (row: UserApi.UserVO) => {
  try {
--- a/src/views/task/exam/components/steps/step3/index.vue
+++ b/src/views/task/exam/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0" 
--- a/src/views/task/selftrans/ai/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/ai/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0" 
--- a/src/views/task/selftrans/collegeexam/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/collegeexam/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0" 
--- a/src/views/task/selftrans/module/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/module/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0" 
--- a/src/views/task/selftrans/random/components/steps/step3/index.vue
+++ b/src/views/task/selftrans/random/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0" 
--- a/src/views/task/sprint/components/steps/step3/index.vue
+++ b/src/views/task/sprint/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0" 
--- a/src/views/task/trans/components/steps/step3/index.vue
+++ b/src/views/task/trans/components/steps/step3/index.vue
@@ -39,7 +39,7 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="是否在查看时显示试卷内容">
+          <el-form-item label="是否显示解析按钮">
            <el-switch 
              v-model="form.isContent" 
              active-value="0"