From 90bd7911e6f0f88c6bd5ed44a47a62e9bfbacf90 Mon Sep 17 00:00:00 2001
From: helen <zhushui060631@163.com>
Date: Thu, 26 Dec 2024 15:50:45 +0800
Subject: [PATCH] bug

---
 src/views/manage/mkJigsaw/index.vue   | 30 +++++++++++++++++----------
 src/views/manage/noteManage/index.vue | 12 +++++------
 src/views/manage/report/index.vue     | 19 +++++++++++++----
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/views/manage/mkJigsaw/index.vue b/src/views/manage/mkJigsaw/index.vue
index 4af0193..bdb2e10 100644
--- a/src/views/manage/mkJigsaw/index.vue
+++ b/src/views/manage/mkJigsaw/index.vue
@@ -24,13 +24,13 @@
 
     <el-card shadow="never">
       <el-table v-loading="loading" :data="mkJigsawList">
-        <el-table-column label="任务名称" align="center" prop="name" />
+        <el-table-column label="任务名称" align="center" prop="name" show-overflow-tooltip />
         <el-table-column label="任务类别" align="center" prop="category">
           <template #default="scope">
             <dict-tag :options="mk_jigsaw_task_catagory" :value="scope.row.category" />
           </template>
         </el-table-column>
-        <el-table-column label="商品ID" align="center" prop="productId" />
+        <el-table-column label="商品ID" align="center" prop="productId" show-overflow-tooltip />
         <el-table-column label="商品名称" align="center" prop="productName" />
         <el-table-column label="商品类别" align="center" prop="productCategory">
           <template #default="scope">
@@ -45,8 +45,16 @@
         </el-table-column>
         <el-table-column label="拼图数量" align="center" prop="jigsawConfigCount" />
         <el-table-column label="设置得奖人数" align="center" prop="awardConfigCount" />
-        <el-table-column label="参与人数" align="center" prop="joinCount" />
-        <el-table-column label="实际得奖人数" align="center" prop="awardCount" />
+        <el-table-column label="参与人数" align="center" prop="joinCount">
+          <template #default="scope">
+            <el-button type="primary" link>{{ scope.row.joinCount }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际得奖人数" align="center" prop="awardCount">
+          <template #default="scope">
+            <el-button type="primary" link>{{ scope.row.awardCount }}</el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="拼图碎片获得人数" align="center" prop="awardCount">
           <template #default="scope">
             <el-button type="primary" link @click="imagesui(scope.row)">查看详情</el-button>
@@ -65,9 +73,9 @@
             <el-tag v-if="scope.row.status == 2" type="primary">已发布</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="创建人" align="center" prop="createName" />
-        <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
+        <el-table-column label="创建人" align="center" prop="createName" show-overflow-tooltip />
+        <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
           <template #default="scope">
             <el-button v-if="scope.row.status == 0" v-hasPermi="['manage:mkJigsaw:edit']" link type="primary" @click="handleUpdate(scope.row, 2)"
               >编辑</el-button
@@ -187,20 +195,20 @@
           <div>{{ form.startDate }}~{{ form.endDate }}</div>
         </el-form-item>
         <el-form-item label="设置拼图数量">
-          <div>{{form.jigsawConfigCount}}</div>
+          <div>{{ form.jigsawConfigCount }}</div>
         </el-form-item>
         <el-form-item label="得奖人数">
-          <div>{{form.awardConfigCount}}</div>
+          <div>{{ form.awardConfigCount }}</div>
         </el-form-item>
         <el-form-item label="控制得奖拼图">
-          <el-select v-model="form.controlJigsawIndex" placeholder="请选择控制得奖拼图" style="width: 300px" @change="selectnumlist" disabled>
+          <el-select v-model="form.controlJigsawIndex" placeholder="请选择控制得奖拼图" style="width: 300px" disabled @change="selectnumlist">
             <el-option v-for="dict in numlist" :key="dict.label" :label="dict.label" :value="dict.label"></el-option>
           </el-select>
         </el-form-item>
         <div class="numlistclasss">
           <div v-for="item in numlistdata" :key="item.name">
             <el-form-item :label="`${item.name}：可获得概率`">
-              <div>{{item.probability}}%</div>
+              <div>{{ item.probability }}%</div>
             </el-form-item>
           </div>
         </div>
diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue
index 0dde58c..2da7ec3 100644
--- a/src/views/manage/noteManage/index.vue
+++ b/src/views/manage/noteManage/index.vue
@@ -13,7 +13,7 @@
             </el-form-item>
             <el-form-item label="标记地点" prop="cover">
               <!--              <el-input v-model="queryParams.cover" placeholder="请输入标记地点" clearable @keyup.enter="handleQuery" />-->
-              <el-select v-model="queryParams.cover" placeholder="请选择标记地点" style="width: 240px">
+              <el-select v-model="queryParams.location" placeholder="请选择标记地点" style="width: 240px">
                 <el-option v-for="item in sys_user_contentOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -36,20 +36,20 @@
     <el-card shadow="never">
       <el-table v-loading="loading" :data="notebookList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
-        <el-table-column v-if="true" label="ID" align="center" prop="id" />
-        <el-table-column label="笔记标题" align="center" prop="title" />
+        <el-table-column v-if="true" label="ID" align="center" prop="id" show-overflow-tooltip/>
+        <el-table-column label="笔记标题" align="center" prop="title" show-overflow-tooltip/>
         <el-table-column label="笔记封面" align="center" prop="cover">
           <template #default="scope">
-            <image-preview :src="scope.row.cover" :width="50" :height="50" />
+            <image-preview :src="scope.row.cover" :width="40" :height="40" />
             <!-- <image-preview :src="scope.row.productImageUrl" /> -->
           </template>
         </el-table-column>
-        <el-table-column label="标记地点" align="center" prop="location">
+        <el-table-column label="标记地点" align="center" prop="location" show-overflow-tooltip>
           <template #default="scope">
             <span>{{ formatlocation(scope.row.location) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="标签" align="center" prop="tagId">
+        <el-table-column label="标签" align="center" prop="tagId" show-overflow-tooltip>
           <template #default="scope">
             <span>{{ formatTag(scope.row.tagId) }}</span>
           </template>
diff --git a/src/views/manage/report/index.vue b/src/views/manage/report/index.vue
index 110e0e2..240bc2c 100644
--- a/src/views/manage/report/index.vue
+++ b/src/views/manage/report/index.vue
@@ -85,7 +85,15 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
           <template #default="scope">
             <el-button v-hasPermi="['manage:report:edit']" link type="primary" @click="handleUpdate(scope.row)">封禁</el-button>
-            <el-button v-hasPermi="['manage:report:remove']" link type="primary" @click="handleDelete(scope.row)">删除{{ radio1 }}</el-button>
+            <el-button v-if="queryParams.type == 1" v-hasPermi="['manage:report:remove']" link type="primary" @click="handleDelete(scope.row)"
+              >删除笔记</el-button
+            >
+            <el-button v-if="queryParams.type == 2" v-hasPermi="['manage:report:remove']" link type="primary" @click="handleDelete(scope.row)"
+              >删除活动</el-button
+            >
+            <el-button v-if="queryParams.type == 3" v-hasPermi="['manage:report:remove']" link type="primary" @click="handleDelete(scope.row)"
+              >删除评论</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -125,6 +133,7 @@
 <script setup name="Banned" lang="ts">
 import { listBanned, getBanned, delBanned, addBanned, updateBanned, userLevelall } from '@/api/manage/banned';
 import { BannedVO, BannedQuery, BannedForm } from '@/api/manage/banned/types';
+import { delNotebook } from '@/api/manage/notebook';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { dy_banned_handling_method, sys_user_sex, dy_banned_ban_reason, dy_user_ban_days } = toRefs<any>(
@@ -281,9 +290,11 @@ const submitForm = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: BannedVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除举报编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delBanned(_ids);
+  const _ids = row?.contentId;
+  const _idsname = row?.contentName;
+  const text = queryParams.value.type == 1 ? '笔记名称为“' : queryParams.value.type == 2 ? '活动名称为“' : '评论内容为“';
+  await proxy?.$modal.confirm('是否确认删除' + text + _idsname + '"的数据项？').finally(() => (loading.value = false));
+  await delNotebook(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };