diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 3ae3b8e..faea7ef 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -168,7 +168,7 @@ onMounted(() => {
class="list_item"
@click="goPath(item, sitem.id)"
>
-
+
@@ -181,7 +181,7 @@ onMounted(() => {
// width: 60%;
width: 808px;
position: absolute;
- top: 118px;
+ top: 190px;
left:0;
right: 0;
box-shadow: none !important;
@@ -211,8 +211,6 @@ onMounted(() => {
.list_box {
- //border: 1px dashed #f4f4f4;
- border: 1px dashed #f4f4f4;
border-radius: 8px;
box-shadow: 0px 12px 12px 0px rgba(80,122,253,0.15);
margin-top: 15px;
@@ -226,12 +224,12 @@ onMounted(() => {
.list_classfiy_item {
margin-bottom: -2px;
.list_title {
- font-size: 12px;
+ font-size: 16px;
font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular;
color: #999999;
line-height: 17px;
- margin: 6px 0 12px 0;
+ margin: 8px 0 10px 0;
font-weight: 500;
}
@@ -239,7 +237,7 @@ onMounted(() => {
display: flex;
flex-flow: row nowrap;
align-items: center;
- margin: 16px 0;
+ margin: 0 0 12px 0
}
}
}
@@ -268,7 +266,7 @@ onMounted(() => {
flex: 1;
overflow-y: hidden;
overflow-x: auto;
- margin: 9px 0 9px 0px;
+ margin: -1px 0 9px 0px;
.tag {
font-weight: 500;
@@ -277,7 +275,7 @@ onMounted(() => {
border: 1px solid #e4e7ed;
border-radius: 12px;
margin-right: 12px;
- font-size: 13px;
+ font-size: 16px;
font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular;
text-align: left;
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index c02cd69..48e8278 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -78,7 +78,7 @@ const finishPackageModal = ref(null)
const loading = ref(false)
const message = useMessage()
const totalCount = ref(0)
-
+const loadref=ref(true)
const sortBy: PictureSortParam = {
orderbyname: 'desc',
orderbyvalue: 'pictureResult',
@@ -107,14 +107,15 @@ const listStyle = computed(() => {
height: `${deviceHeight.value}px`,
}
})
-async function init() {
+async function inittask() {
let result = await getLastCheckNox()
console.log(result.data)
if(result.data){
let res=await getCheckDuplicateStatusx({checkDuplicateNo:result.data})
if(res.data.status==1){
const checkingTaskModal = checkingTaskModalRef.value as any
- checkingTaskModal.showModal()
+ checkingTaskModal.showModal()
+ loadref.value=false
}
}
}
@@ -169,14 +170,7 @@ onBeforeMount(async () => {
cols.value = 5
})
-onUpdated(() => {
- init()
- // nextTick(() => {
- // setTimeout(() => {
- // layout()
- // }, 50)
- // })
-})
+
const timeRange = ref('')
const timeLabel = computed(() => {
@@ -406,6 +400,7 @@ const gridMinHeight = computed(() => {
})
async function oneCheck() {
+ loadref.value=false
const asideVal = cloneDeep(configStore.getAsideValue)
asideVal.upUserName = searchValue.value
@@ -434,9 +429,11 @@ async function oneCheck() {
configStore.setTimeNum(calNum.value)
if (checkTaskStatus.value === 2 || checkTaskStatus.value === 3) {
if (checkTaskStatus.value === 2)
- message.success('任务执行完毕，正在刷新数据...')
- else message.error('查询异常')
-
+ { message.success('任务执行完毕，正在刷新数据...')
+ loadref.value=true
+ }else{ message.error('查询异常')
+ loadref.value=true
+ }
tasksLoadingModal.closeOnlyModal()
configStore.setTimeNum(100)
if (timer.value)
@@ -529,6 +526,7 @@ async function commitHandler(settingParam) {
}
onMounted(() => {
+ inittask()
emitter.on('filter', refreshHandler)
// emitter.on("filter", (searchId)=>{
// console.log("emitter on filter" + searchId)
@@ -676,10 +674,13 @@ function refresh(val?: any) {
checkingTaskModal.closeModal()
isRefresh.value = false
if (checkTaskStatus.value === 2)
- message.success('任务执行完毕，正在刷新数据...')
- else message.error('查询异常')
-
- if (timer.value)
+ {
+ message.success('任务执行完毕，正在刷新数据...')
+ loadref.value=true
+ }
+ else{ message.error('查询异常')
+ loadref.value=true
+ }if (timer.value)
clearInterval(timer.value)
reset()
loadMore()
@@ -702,6 +703,7 @@ function cancel() {
checkDuplicateNo.value = ''
checkTaskStatus.value = null
message.success('查重任务取消成功')
+ loadref.value=true
}
})
}
@@ -776,11 +778,18 @@ defineExpose({
+
-