From e34a11759f594515c53b65292d994ab5f7dd4b9b Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Mon, 22 Apr 2024 19:32:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=9C=AA=E9=80=9A=E8=BF=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 11 +++++++++--
 src/views/home/index.vue                      |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 97c590d..731b26a 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -696,11 +696,13 @@ watch(() => show.value, async (newVal) => {
                     返回
                   </n-button>
                   <div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
-                    <SvgIcon width="64" height="28" name="a1" />
+                    <!--<SvgIcon width="64" height="28" name="a1" />-->
+                     <img class="btn-approval btn-left" style="margin-left: 16px" src="@/assets/images/task/btn-not-pass.png" alt="" >
                   </div>
                   <SvgIcon size="24" name="vs" />
                   <div style="cursor: pointer" @click.stop="approvalHandler">
-                    <SvgIcon width="64" height="28" name="a2" />
+                   <!-- <SvgIcon width="64" height="28" name="a2" />-->
+                    <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" >
                   </div>
                 </div>
               </div>
@@ -779,6 +781,11 @@ watch(() => show.value, async (newVal) => {
 </template>
 
 <style lang="less" scoped>
+ .btn-approval{
+    width: 68px;
+    height: 28px;
+    cursor: pointer;
+  }
 .card {
   width: 100vw;
   height: calc(100vh - 64px);
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 360dc81..982aec1 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -20,7 +20,7 @@ const showLoginModal = ()=>{
     <Content ref="contentRef"/>
 
     <!-- 机器人 -->
-    <!-- <Robot :canClick="true" @click="showLoginModal"/> -->
+     <Robot :canClick="true" @click="showLoginModal"/> 
   </div>
 </template>
 

From ac9abbb3601f53dda4a8c8b646ac04626bf3907b Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Mon, 22 Apr 2024 19:51:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E9=A6=96=E9=A1=B5=E5=B0=8F=E7=8B=97?=
 =?UTF-8?q?=E5=8A=A0=E5=BF=AB=E6=8D=B7=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue                 | 6 +++++-
 src/views/home/content/modal/LoginSuccessModal.vue | 2 +-
 src/views/home/index.vue                           | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 4e424d9..68b60b3 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -402,7 +402,10 @@ async function showLoginSuccessModal() {
   const modal = LoginSuccessModalRef.value as any
   modal.showModal()
 }
-
+async function closeLoginSuccessModal() {
+  const modal = LoginSuccessModalRef.value as any
+  modal.closeModal()
+}
 // 包id
 const packageIdRef = ref('')
 
@@ -638,6 +641,7 @@ const dropdownOptions = ref([
 
 defineExpose({
   showLoginSuccessModal,
+  closeLoginSuccessModal
 })
 </script>
 
diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue
index 9155a61..5b86ee9 100644
--- a/src/views/home/content/modal/LoginSuccessModal.vue
+++ b/src/views/home/content/modal/LoginSuccessModal.vue
@@ -41,7 +41,7 @@ async function viewRepeat(e: MouseEvent) {
 }
 
 defineExpose({
-  showModal,
+  showModal,closeModal
 });
 </script>
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 982aec1..22d8087 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -3,12 +3,17 @@ import Aside from './aside/Aside.vue'
 import Content from './content/Content.vue'
 import Robot from '@/components/Robot/index.vue'
 import {ref} from 'vue';
+import { useKeydown } from '@/hooks/event/useKeydown'
 const contentRef:any = ref(null)
 
 const showLoginModal = ()=>{
   contentRef.value.showLoginSuccessModal();
 }
-
+const closeLoginModal = ()=>{
+  contentRef.value.closeLoginSuccessModal();
+}
+useKeydown('m m', showLoginModal)
+useKeydown('enter', closeLoginModal)
 </script>
 
 <template>

From b641b502f4d45a289f46b923a35c4f3bd3307b66 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Mon, 22 Apr 2024 20:56:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E7=BB=88=E5=AE=A1=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=8C=96=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/ListContent.vue | 2 +-
 src/views/task/modal/BatchModal.vue     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 90457e0..7279e19 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -239,7 +239,7 @@ function isValidTimestamp(value) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndexm,type:'card' },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskNode, type:'card' },
   })
 }
 // 小结批量不通过
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 0e8471d..c8c44d7 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -15,12 +15,13 @@ import { formatToDateHMS } from '@/utils/dateUtil'
 import { getSimilarityList, getTaskDetailInfo } from '@/api/task/task'
 import emitter from '@/utils/mitt'
 import bgLoading from '@/assets/images/bg-loading.png'
+import { useRoute } from 'vue-router'
 
 const emit = defineEmits<{
   (e: 'reject', params: any)
   (e: 'approval', params: any)
 }>()
-
+const {query} = useRoute()
 const cardStyle = {
   '--n-padding-bottom': '40px',
   '--n-padding-left': '120px',
@@ -271,6 +272,7 @@ function handleKeydown(event) {
 }
 function showModal(value) {
   taskId.value = value
+  console.log('showModal')
   refreshHandler()
   show.value = true
 }
@@ -351,7 +353,7 @@ async function refreshHandler() {
   if (!taskId.value)
     return
   const taskPackage = taskStore.getApprovalList[taskStore.getCurrentIndex] || {}
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, taskPackage.packageid, taskPackage?.taskIndex || '')
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, taskPackage.packageid||query.packageid, taskPackage?.taskIndex || query.taskindex)
   nextTick(() => {
     setTimeout(() => {
       useInfiniteScroll(