From 3997ab3eaa32c89e0d4def0c9dbdbf353146b068 Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Thu, 23 May 2024 17:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/scale/SysScaleQuestion/index.ts         |  7 ++++---
 src/views/activity/component/schedule/index.vue |  2 +-
 src/views/scale/SysScaleQuestion/index.vue      | 11 +++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/api/scale/SysScaleQuestion/index.ts b/src/api/scale/SysScaleQuestion/index.ts
index fe5ae6c..fb0d80d 100644
--- a/src/api/scale/SysScaleQuestion/index.ts
+++ b/src/api/scale/SysScaleQuestion/index.ts
@@ -68,9 +68,10 @@ export const updateSysScaleQuestion = (data: SysScaleQuestionForm) => {
  * 删除量问题内容
  * @param questionId
  */
-export const delSysScaleQuestion = (questionId: string | number | Array<string | number>) => {
+export const delSysScaleQuestion = (data: any) => {
   return request({
-    url: '/scale/question/' + questionId,
-    method: 'delete'
+    url: '/scale/question',
+    method: 'delete',
+    data
   });
 };
diff --git a/src/views/activity/component/schedule/index.vue b/src/views/activity/component/schedule/index.vue
index 85f6a1b..c61fe9b 100644
--- a/src/views/activity/component/schedule/index.vue
+++ b/src/views/activity/component/schedule/index.vue
@@ -72,7 +72,7 @@
         <el-table-column prop="deptName" label="班级" />
         <el-table-column prop="status" label="状态">
           <template #default="scope">
-            <el-tag :type="scope.row.status == 0 ? 'danger' : 'success'">{{ scope.row.status == 0 ? '未测' :
+            <el-tag :type="scope.row.status <= 0 ? 'danger' : 'success'">{{ scope.row.status <= 0 ? '未测' :
               '已测' }}</el-tag>
           </template>
         </el-table-column>
diff --git a/src/views/scale/SysScaleQuestion/index.vue b/src/views/scale/SysScaleQuestion/index.vue
index 64c1f7c..d60662a 100644
--- a/src/views/scale/SysScaleQuestion/index.vue
+++ b/src/views/scale/SysScaleQuestion/index.vue
@@ -37,10 +37,10 @@
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
               v-hasPermi="['scale:question:edit']">修改</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
               v-hasPermi="['scale:question:remove']">删除</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport"
               v-hasPermi="['scale:question:export']">导出</el-button>
@@ -50,7 +50,7 @@
       </template>
 
       <el-table v-loading="loading" :data="SysScaleQuestionList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <!-- <el-table-column label="测评量表标题" align="center" prop="scaleTitle" /> -->
         <el-table-column label="问题序号" align="center" prop="questionOrder" />
         <el-table-column label="问题内容" align="center" prop="questionContent" />
@@ -330,9 +330,8 @@ const submitForm = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: SysScaleQuestionVO) => {
-  const _questionIds = row?.questionId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除量问题内容编号为"' + _questionIds + '"的数据项？').finally(() => loading.value = false);
-  await delSysScaleQuestion(_questionIds);
+  await proxy?.$modal.confirm('是否确认删除量问题内容编号为"' + row?.questionContent + '"的数据项？').finally(() => loading.value = false);
+  await delSysScaleQuestion({ questionId: row?.questionId, scaleId });
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
 }