feat: 已下架爬虫也能批量上架

frontend/src/views/CodeList.vue

@@ -631,6 +631,7 @@ const tableEvents = {
         onlyClickHighlight(row, '_action_clicked_verify')
         loading.value = true
         if (!row.cssmark) {
+            loading.value = false
             return ElMessage({
                 message: '没有找到标注信息',
                 type: 'error',

frontend/src/views/ReviewList.vue

@@ -92,17 +92,6 @@
                 </el-table-column>
                 <el-table-column label="功能" width="120" align="center">
                     <template #default="scope">
-                        <!-- 审核人员：通过和打回，管理员也有此功能 -->
-                        <el-tooltip content="通过" placement="top" v-if="tableActionShow.reviewerGroup(scope.row)">
-                            <el-button size="small" :class="{ active: scope.row._action_clicked_submit }" :disabled="actionButtonDisabled.reviewerSubmit(scope.row)" @click="tableEvents.reviewerSubmit(scope.$index, scope.row)">
-                                <el-icon><CircleCheck /></el-icon>
-                            </el-button>
-                        </el-tooltip>
-                        <el-tooltip content="打回" placement="top">
-                            <el-button size="small" :class="{ active: scope.row._action_clicked_rollback }" :disabled="actionButtonDisabled.reviewerRollback(scope.row)" @click="tableEvents.reviewerRollback(scope.$index, scope.row)">
-                                <el-icon><CircleClose /></el-icon>
-                            </el-button>
-                        </el-tooltip>
                         <!-- 管理员：上线和退回 -->
                         <template v-if="tableActionShow.adminGroup(scope.row)">
                             <el-tooltip content="下线" placement="top" v-if="tableActionShow.downCode(scope.row)">
@@ -121,6 +110,17 @@
                                 </el-button>
                             </el-tooltip>
                         </template>
+                        <!-- 审核人员：通过和打回，管理员也有此功能 -->
+                        <el-tooltip content="通过" placement="top" v-if="tableActionShow.reviewerGroup(scope.row)">
+                            <el-button size="small" :class="{ active: scope.row._action_clicked_submit }" :disabled="actionButtonDisabled.reviewerSubmit(scope.row)" @click="tableEvents.reviewerSubmit(scope.$index, scope.row)">
+                                <el-icon><CircleCheck /></el-icon>
+                            </el-button>
+                        </el-tooltip>
+                        <el-tooltip content="打回" placement="top">
+                            <el-button size="small" :class="{ active: scope.row._action_clicked_rollback }" :disabled="actionButtonDisabled.reviewerRollback(scope.row)" @click="tableEvents.reviewerRollback(scope.$index, scope.row)">
+                                <el-icon><CircleClose /></el-icon>
+                            </el-button>
+                        </el-tooltip>
                     </template>
                 </el-table-column>
             </el-table>
@@ -637,6 +637,7 @@ const tableEvents = {
         onlyClickHighlight(row, '_action_clicked_verify')
         loading.value = true
         if (!row.cssmark) {
+            loading.value = false
             return ElMessage({
                 message: '没有找到标注信息',
                 type: 'error',
@@ -856,13 +857,13 @@ const toggleRow = (rowList = []) => {
 }
 
 const tableRowSelectable = (row) => {
-    // 待审核(管理员的批量打回)、已通过(管理员的批量上线)或者已上线(管理员的批量下线)的才能选
-    return row.state === 1 || row.state === 3 || row.state === 11
+    // 待审核(管理员的批量打回)、已通过(管理员的批量上线)、已下架的批量上线或者已上线(管理员的批量下线)的才能选
+    return row.state === 1 || row.state === 3 || row.state === 6 || row.state === 11
 }
 
 // 批量打回
 const confirmBatchRollback = () => {
-    // 过滤一下，找到已上线爬虫，仅提交此类爬虫(因为能选中的只有3和11，所以直接过滤获取2组)
+    // 过滤一下，找到已上线爬虫，仅提交此类爬虫
     let list = []
     let dropList = []
     if (isAdmin.value) {
@@ -877,7 +878,7 @@ const confirmBatchRollback = () => {
     toggleRow(dropList)
     if (list.length <= 0) {
         return ElMessage({
-            message: '至少要选中1条有效数据: 当前未选中待审核爬虫',
+            message: '至少要选中1条有效数据: 当前未选中待审核或者已通过爬虫',
             type: 'error',
             duration: 3000,
         })
@@ -905,13 +906,13 @@ const doBatchRollback = () => {
 
 // 执行批量上线
 const confirmBatchListing = () => {
-    // 过滤一下，找到已通过爬虫，仅提交此类爬虫(因为能选中的只有3和11，所以直接过滤获取2组)
-    const list = listState.selected.filter(v => v.state === 3)
-    const dropList = listState.selected.filter(v => v.state !== 3)
+    // 过滤一下，找到已通过爬虫，仅提交此类爬虫
+    const list = listState.selected.filter(v => v.state === 3 || v.state === 6)
+    const dropList = listState.selected.filter(v => !(v.state === 3 || v.state === 6))
     toggleRow(dropList)
     if (list.length <= 0) {
         return ElMessage({
-            message: '至少要选中1条有效数据: 当前未选中已通过爬虫',
+            message: '至少要选中1条有效数据: 当前未选中已通过或已下线爬虫',
             type: 'error',
             duration: 3000,
         })
@@ -935,7 +936,7 @@ const doBatchListing = () => {
 
 // 执行批量下线操作
 const confirmBatchUnListing = () => {
-    // 过滤一下，找到已上线爬虫，仅提交此类爬虫(因为能选中的只有3和11，所以直接过滤获取2组)
+    // 过滤一下，找到已上线爬虫，仅提交此类爬虫
     const list = listState.selected.filter(v => v.state === 11)
     const dropList = listState.selected.filter(v => v.state !== 11)
     toggleRow(dropList)