Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic

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);

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' },
   })
 }
 // 小结批量不通过

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>
 

src/views/home/content/modal/LoginSuccessModal.vue

@@ -41,7 +41,7 @@ async function viewRepeat(e: MouseEvent) {
 }
 
 defineExpose({
-  showModal,
+  showModal,closeModal
 });
 </script>
 

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>
@@ -20,7 +25,7 @@ const showLoginModal = ()=>{
     <Content ref="contentRef"/>
 
     <!-- 机器人 -->
-    <!-- <Robot :canClick="true" @click="showLoginModal"/> -->
+     <Robot :canClick="true" @click="showLoginModal"/> 
   </div>
 </template>
 

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(