guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'fix/updatesyspic' (#317) from fix/updatesyspic into test

Browse Source 
Reviewed-on: #317
pull/320/head
yaoshuli 1 year ago
parent bda9429804 f1cd480b3f
commit f8ad3d119f
3 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File

30
src/layout/components/Header/RecycleModal.vue
Unescape View File

@ -127,8 +127,6 @@ const confrimModalRef = ref<any>()
// // } // // }
// // el.value!.scrollTo({ top: height, behavior: 'instant' }) // // el.value!.scrollTo({ top: height, behavior: 'instant' })
// loading = false // loading = false
// console.log('loading---------------', loading)
// console.log('pagination.pageNo---------------', pagination.pageNo)
// if (pagination.pageNo == 3) { // if (pagination.pageNo == 3) {
// let timer // let timer
// if (timer) // if (timer)
@ -136,7 +134,6 @@ const confrimModalRef = ref<any>()
// timer = setTimeout(() => { // timer = setTimeout(() => {
// isTop.value = false // isTop.value = false
// console.log('isTop.value---------------', isTop.value)
// }, 1000) // }, 1000)
// } // }
// }) // })
@ -171,7 +168,6 @@ async function featchList() {
try { try {
// const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value }) // const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value })
pagination.pageNo += 1 pagination.pageNo += 1
// console.log('pagination.pageNo------------', pagination.pageNo)
const result = await dubiousfilelist({ ...pagination, ...sortObj }) const result = await dubiousfilelist({ ...pagination, ...sortObj })
// TODO：测试数据 // TODO：测试数据
// result.data = Array.from({ length: 30 }) // result.data = Array.from({ length: 30 })
@ -180,7 +176,6 @@ async function featchList() {
// canloadMore = pageCount >= pagination.pageNo && pageCount > 0; // canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
canloadMore = data.pages >= pagination.pageNo && data.pages > 0 canloadMore = data.pages >= pagination.pageNo && data.pages > 0
// console.log('canloadMore------------', canloadMore)
loading = false loading = false
return result.data.records return result.data.records
// const list = data.map((item) => { // const list = data.map((item) => {
@ -201,12 +196,10 @@ const app = getCurrentInstance()
const updateHtml = debounce(() => { const updateHtml = debounce(() => {
// app?.appContext.app.$waterfall?.forceUpdate() // app?.appContext.app.$waterfall?.forceUpdate()
console.log('更新页面了')
waterfallRef.value?.resize() waterfallRef.value?.resize()
}, 200) }, 200)
async function loadMore() { async function loadMore() {
console.log('可疑文件夹出来了11111111111111', loading, el.value)
if (loading || el.value == null) if (loading || el.value == null)
return return
@ -221,13 +214,11 @@ async function loadMore() {
if (pagination.pageNo <= 1) { if (pagination.pageNo <= 1) {
listData.value = [] listData.value = []
listData.value = listData.value.concat(more) listData.value = listData.value.concat(more)
console.log('listData.value可疑文件夹出来了11111111111111', listData.value, pagination.pageNo)
if (pagination.pageNo <= 1) if (pagination.pageNo <= 1)
waterfallRef.value?.resize() waterfallRef.value?.resize()
} }
else { else {
listData.value = listData.value.concat(more) listData.value = listData.value.concat(more)
console.log('listData.value可疑文件夹出来了2222222222', listData.value, pagination.pageNo)
// waterfallRef.value?.mix() // waterfallRef.value?.mix()
updateHtml() updateHtml()
} }
@ -283,21 +274,6 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) {
if (rect.right > x && rect.bottom > y && rect.left < x + w && rect.top < y + h) if (rect.right > x && rect.bottom > y && rect.left < x + w && rect.top < y + h)
index === -1 && selectIds.value.push(item.dataset.id!) index === -1 && selectIds.value.push(item.dataset.id!)
else index !== -1 && selectIds.value.splice(index, 1) else index !== -1 && selectIds.value.splice(index, 1)
// let tempApproveIndex = -1;
// selectedApproveItems.value.map((approveItem, approveIndex) => {
// console.log("approveItem and item", approveItem, item );
// if(approveItem.selfId == item.dataset.id) {
// tempApproveIndex = approveIndex;
// }
// })
// if (tempApproveIndex === -1 && item.className.indexOf('grid-item-selected') != -1) {
// let tempItem: any = cloneDeep(item);
// tempItem.selfId = item.dataset.id;
// selectedApproveItems.value.push(tempItem)
// } else {
// selectedApproveItems.value.splice(tempApproveIndex, 1);
// }
}) })
selectedApproveItems.value = [] selectedApproveItems.value = []
// 选中复选框 // 选中复选框
@ -307,12 +283,10 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) {
selectedApproveItems.value.push(item) selectedApproveItems.value.push(item)
} }
}) })
console.log('selectedApproveItems.value可疑选中了。。。。。。。。', selectedApproveItems.value)
updateHtml() updateHtml()
} }
function isSelected(pictureId: number) { function isSelected(pictureId: number) {
// console.log('selectIds.value多少只啊啊啊啊啊啊啊啊啊啊啊啊啊', selectIds.value, pictureId)
return selectIds.value.includes(String(pictureId)) return selectIds.value.includes(String(pictureId))
} }
@ -500,7 +474,6 @@ async function commit() {
} }
} }
function remove() { function remove() {
// console.log("finally-selectedApproveItems------------", selectedApproveItems.value);
if (!selectIds.value || selectIds.value.length === 0) { if (!selectIds.value || selectIds.value.length === 0) {
message.error('至少选中一个') message.error('至少选中一个')
return return
@ -509,7 +482,6 @@ function remove() {
} }
function setBatch(value, isUpdate?) { function setBatch(value, isUpdate?) {
// console.log('执行了设置可疑勾选-------------')
if (value && batch.value) if (value && batch.value)
batch.value = !value batch.value = !value
else else
@ -676,7 +648,6 @@ async function refreshHandler(filtersearchId?: any) {
} }
function finish() { function finish() {
// console.log('finish')
} }
onBeforeMount(async () => { onBeforeMount(async () => {
@ -706,7 +677,6 @@ watch(() => show.value, async (newVal) => {
// const list = await featchList() // const list = await featchList()
// listData.value = list // listData.value = list
// layout() // layout()
console.log('开启了可疑弹窗aaa')
setTimeout(() => { setTimeout(() => {
reset() reset()
loadMore() loadMore()

17
src/views/home/content/Content.vue
Unescape View File

@ -110,7 +110,6 @@ const listStyle = computed(() => {
}) })
async function inittask() { async function inittask() {
const result = await getLastCheckNox() const result = await getLastCheckNox()
console.log(result.data)
if (result.data) { if (result.data) {
const res = await getCheckDuplicateStatusx({ checkDuplicateNo: result.data }) const res = await getCheckDuplicateStatusx({ checkDuplicateNo: result.data })
if (res.data.status == 1) { if (res.data.status == 1) {
@ -188,14 +187,10 @@ const isInitSeaerch = ref(false) // 是否初始化搜索
const collapse = ref(1) const collapse = ref(1)
nextTick(() => { nextTick(() => {
configStore.$subscribe(() => { configStore.$subscribe(() => {
// console.log('subscribe', 'configStore')
isAllowDownload.value = configStore.isAllowDownload isAllowDownload.value = configStore.isAllowDownload
calNum.value = configStore.getTimeNum calNum.value = configStore.getTimeNum
// console.log("calNum.value----------", calNum.value);
searchValue.value = configStore.getSearchValue searchValue.value = configStore.getSearchValue
// console.log(configStore.getSearchValue, 'getSearchValue')
collapse.value = configStore.getCollapse ? 1 : 0 collapse.value = configStore.getCollapse ? 1 : 0
// console.log('collapse.value的这个肚饿的点点滴滴的点点滴滴', collapse.value)
}) })
}) })
@ -226,7 +221,6 @@ watch(() => collapse.value, (newVal, oldVal) => {
}) })
const asideLoadMore = debounce(() => { const asideLoadMore = debounce(() => {
console.log('加载了这里首页的数据--------------------')
reset() reset()
loadMore() loadMore()
}, 400) }, 400)
@ -234,7 +228,6 @@ const asideLoadMore = debounce(() => {
watch( watch(
() => searchValue.value, () => searchValue.value,
async (newVal, oldVal) => { async (newVal, oldVal) => {
// console.log('首页搜索框的值', newVal, oldVal)
if (newVal) { if (newVal) {
isInitSeaerch.value = true isInitSeaerch.value = true
// pagination.pageNo = 0 // pagination.pageNo = 0
@ -263,7 +256,6 @@ watch(
watch( watch(
() => configStore.getAsideValue, () => configStore.getAsideValue,
async (newVal, oldVal) => { async (newVal, oldVal) => {
// console.log('configStore.getAsideValue首页变化了啊', newVal, oldVal, Object.entries(newVal).toString() === Object.entries(oldVal).toString(), pagination.pageNo)
if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) { if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) {
// reset() // reset()
asideLoadMore() asideLoadMore()
@ -300,8 +292,6 @@ async function featchList(userSearchId?: string) {
params.izsimilarity = params.izsimilarity.join('-') params.izsimilarity = params.izsimilarity.join('-')
// rao end // rao end
// console.log('window.cancle.queryPageListByCheckNo', window.cancle.queryPageListByCheckNo)
// console.log('window.cancle.getPictureList', window.cancle.getPictureList)
if (checkTaskStatus.value === 2 && isRefresh) { if (checkTaskStatus.value === 2 && isRefresh) {
// 取消上次的请求 // 取消上次的请求
window.cancle.queryPageListByCheckNo && window.cancle.queryPageListByCheckNo() window.cancle.queryPageListByCheckNo && window.cancle.queryPageListByCheckNo()
@ -361,7 +351,6 @@ async function featchList(userSearchId?: string) {
} }
async function loadMore() { async function loadMore() {
console.log('loadMore首页pagination.pageNo----------------', pagination.pageNo)
if (loading.value || el.value == null) if (loading.value || el.value == null)
return return
canloadMore = false canloadMore = false
@ -369,19 +358,16 @@ async function loadMore() {
more.forEach((item) => { more.forEach((item) => {
item.calHeight = 182 * item.high / item.wide item.calHeight = 182 * item.high / item.wide
}) })
console.log('loadMore加载后首页的pagination.pageNo----------------', pagination.pageNo)
// listData.value.push(...more) // listData.value.push(...more)
if (pagination.pageNo <= 1) { if (pagination.pageNo <= 1) {
listData.value = [] listData.value = []
listData.value = listData.value.concat(more) listData.value = listData.value.concat(more)
console.log('listData.value首页出来了1111', listData.value)
waterfallRef.value?.resize() waterfallRef.value?.resize()
if (listData.value.length == 0) if (listData.value.length == 0)
waterfallRef.value?.clear() waterfallRef.value?.clear()
} }
else { else {
listData.value = listData.value.concat(more) listData.value = listData.value.concat(more)
console.log('listData.value首页出来了2222', listData.value)
waterfallRef.value?.mix() waterfallRef.value?.mix()
} }
} }
@ -551,7 +537,6 @@ onMounted(() => {
inittask() inittask()
emitter.on('filter', refreshHandler) emitter.on('filter', refreshHandler)
// emitter.on("filter", (searchId)=>{ // emitter.on("filter", (searchId)=>{
// console.log("emitter on filter" + searchId)
// reset() // reset()
// featchList(searchId) // featchList(searchId)
// }) // })
@ -600,7 +585,6 @@ async function refreshHandler(filtersearchId?: any) {
if (filtersearchId) if (filtersearchId)
filterId = filtersearchId filterId = filtersearchId
// console.log("执行了这里首页的数据");
// loadMore() // loadMore()
asideLoadMore() asideLoadMore()
// nextTick(() => { // nextTick(() => {
@ -766,7 +750,6 @@ const dropdownOptions = ref([
]) ])
function finish() { function finish() {
// console.log('finish')
} }
const masonryRef = ref(null) const masonryRef = ref(null)

6
src/views/task/modal/BatchModal.vue
Unescape View File

@ -96,7 +96,6 @@ onBeforeMount(async () => {
useWindowSizeFn(computeListHeight) useWindowSizeFn(computeListHeight)
function finish() { function finish() {
// console.log('finish')
} }
// const layout = debounce(() => { // const layout = debounce(() => {
@ -161,14 +160,10 @@ async function loadMore() {
if (pagination.pageNo == 1) { if (pagination.pageNo == 1) {
listData.value = [] listData.value = []
listData.value = listData.value.concat(more) listData.value = listData.value.concat(more)
console.log('listData.value出来了11111111111111', listData.value)
// if(pagination.pageNo == 1) {
waterfallRef.value?.resize() waterfallRef.value?.resize()
// }
} }
else { else {
listData.value = listData.value.concat(more) listData.value = listData.value.concat(more)
console.log('listData.value出来了2222222222', listData.value)
waterfallRef.value?.mix() waterfallRef.value?.mix()
} }
} }
@ -187,7 +182,6 @@ async function fetchList() {
) )
// pagination.pageNo = current // pagination.pageNo = current
canloadMore = pageCount >= pagination.pageNo && pageCount > 0 canloadMore = pageCount >= pagination.pageNo && pageCount > 0
// console.log('canloadMore的值为', canloadMore, pageCount, pagination.pageNo)
totalCount.value = total totalCount.value = total
loading.value = false loading.value = false
return data return data

Write Preview
Loading…
Cancel
Save