fix: 合并代码处理冲突

src/views/worksheet/aside/WorkSheetList.vue

@@ -22,8 +22,6 @@ defineProps({
   },
 })
 
-const emit = defineEmits(["ApprovalOver"]);
-
 const emit = defineEmits(['ApprovalOver'])
 
 const workStore = useWorkOrder()

src/views/worksheet/content/Content.vue

@@ -13,7 +13,7 @@ import { format } from 'date-fns'
 import imagesloaded from 'imagesloaded'
 import { clone, cloneDeep, debounce, pickBy } from 'lodash-es'
 import { useDialog, useMessage } from 'naive-ui'
-import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
+import { computed, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
 import PictureInfo from '../components/PictureInfo.vue'
 import ConfrimModal from '../modal/ConfrimModal.vue'
 import type { ApprovalParam, SimilarityPictureSortParam } from '/#/api'
@@ -72,7 +72,7 @@ const isFullScreen = ref(false)
 const notPassModalRef = ref(null)
 const mainImageModalRef = ref(null)
 const wrapperListRef = ref<HTMLElement | undefined>(undefined)
-
+let canloadMore = true
 let processItems: any[] = []
 
 function validate(items: any[]) {
@@ -1250,10 +1250,6 @@ defineExpose({
         justify-content: center;
         background-color: rgba(0, 0, 0, 0.48);
       }
-<<<<<<< HEAD
-
-=======
->>>>>>> test
     }
   }
 }