Merge branch 'milestone0718-2025周年庆后台' of http://39.101.133.168:8807/lihuilin/AnniversaryBackstage into milestone0718-2025周年庆后台

activitylink/src/views/zhongchou/gift/importFixedList/index.vue

@@ -22,13 +22,13 @@
     <el-table :data="tableData" style="width: 100%;height:640px" :row-style="{ height: '60px' }"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="200" />
-      <el-table-column type="index" label="ID" width="250">
+      <el-table-column type="index" label="ID" width="250" show-overflow-tooltip>
         <template #default="scope">
           {{ pagination.pageSize * (pagination.pageNum - 1) + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="姓名" width="250" />
-      <el-table-column prop="jwcode" label="精网号" width="300" />
+      <el-table-column prop="username" label="姓名" width="250" show-overflow-tooltip />
+      <el-table-column prop="jwcode" label="精网号" width="300" show-overflow-tooltip />
       <el-table-column label="操作">
         <template #default="scope">
           <el-button text size="small" type="danger" @click="delUser(scope.row)">删除</el-button>

activitylink/src/views/zhongchou/gift/importuser/index.vue

@@ -22,13 +22,13 @@
     <el-table :data="tableData" style="width: 100%;height:640px" :row-style="{ height: '60px' }"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="200" />
-      <el-table-column type="index" label="ID" width="250">
+      <el-table-column type="index" label="ID" width="250" show-overflow-tooltip>
         <template #default="scope">
           {{ pagination.pageSize * (pagination.pageNum - 1) + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="姓名" width="250" />
-      <el-table-column prop="jwcode" label="精网号" width="300" />
+      <el-table-column prop="username" label="姓名" width="250" show-overflow-tooltip />
+      <el-table-column prop="jwcode" label="精网号" width="300" show-overflow-tooltip />
       <el-table-column label="操作">
         <template #default="scope">
           <el-button text size="small" type="danger" @click="delUser(scope.row)">删除</el-button>
@@ -277,30 +277,4 @@ onMounted(() => {
   overflow-y: auto;
 }
 
-.table-container {
-  height: 650px; /* 设置固定高度 */
-  overflow-y: auto; /* 启用垂直滚动条 */
-  overflow-x: hidden; /* 隐藏水平滚动条（如果不需要的话） */
-  border: 1px solid #ebeef5; /* 可选：添加边框 */
-  border-radius: 4px; /* 可选：添加圆角 */
-}
-
-/* 可选：自定义滚动条样式 */
-.table-container::-webkit-scrollbar {
-  width: 8px;
-}
-
-.table-container::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 4px;
-}
-
-.table-container::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
-  border-radius: 4px;
-}
-
-.table-container::-webkit-scrollbar-thumb:hover {
-  background: #a8a8a8;
-}
 </style>

activitylink/src/views/zhongchou/gift/index.vue

@@ -20,8 +20,8 @@
               </el-icon>
             </template>
           </el-table-column>
-          <el-table-column prop="prizeName" label="名称" width="300" align="center"></el-table-column>
-          <el-table-column prop="gradeName" label="等级" width="200" align="center"></el-table-column>
+          <el-table-column prop="prizeName" label="名称" width="300" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="gradeName" label="等级" width="200" align="center" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" align="center">
             <template #default="scope">
               <el-button type="primary" text @click="goToimportFixedList(scope.row)">导入内定名单</el-button>

activitylink/src/views/zhongchou/level/index.vue

@@ -10,15 +10,15 @@
       <!-- 等级表格 -->
       <div class="table-container">
         <el-table :data="tableData" style="width: 100%" :row-style="{ height: '60px' }">
-          <el-table-column type="index" label="ID" width="120px" fixed="left">
+          <el-table-column type="index" label="ID" width="120px" fixed="left" show-overflow-tooltip>
             <template #default="scope">
               {{ pagination.pageSize * (pagination.pageNum - 1) + scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column prop="gradeName" label="等级名称" width="240" align="center" />
-          <el-table-column prop="amount" label="数量" width="250" align="center" />
-          <el-table-column prop="perWin" label="每轮抽取人数" width="300" align="center" />
-          <el-table-column prop="sort" label="排序" width="240" align="center" />
+          <el-table-column prop="gradeName" label="等级名称" width="240" align="center" show-overflow-tooltip />
+          <el-table-column prop="amount" label="数量" width="250" align="center" show-overflow-tooltip />
+          <el-table-column prop="perWin" label="每轮抽取人数" width="300" align="center" show-overflow-tooltip />
+          <el-table-column prop="sort" label="排序" width="240" align="center" show-overflow-tooltip />
           <el-table-column prop="operation" fixed="right" width="240" label="操作" align="center">
             <template #default="scope">
               <div style="display: flex; gap: 10px; justify-content: center;">