fix:第二次审查修改

pull/294/head
lihui_ocr 1 year ago
parent cbe24d90ff
commit fe67826b0f

@ -168,7 +168,7 @@ onMounted(() => {
class="list_item" class="list_item"
@click="goPath(item, sitem.id)" @click="goPath(item, sitem.id)"
> >
<SvgIcon name="task-icon" size="16" style="margin-left: 16px" /> <SvgIcon name="task-icon" size="20" style="margin-left: 16px" />
<span class="name" v-html="highlightText(sitem.name, value)" /> <span class="name" v-html="highlightText(sitem.name, value)" />
</div> </div>
</div> </div>
@ -181,7 +181,7 @@ onMounted(() => {
// width: 60%; // width: 60%;
width: 808px; width: 808px;
position: absolute; position: absolute;
top: 118px; top: 190px;
left:0; left:0;
right: 0; right: 0;
box-shadow: none !important; box-shadow: none !important;
@ -211,8 +211,6 @@ onMounted(() => {
.list_box { .list_box {
//border: 1px dashed #f4f4f4;
border: 1px dashed #f4f4f4;
border-radius: 8px; border-radius: 8px;
box-shadow: 0px 12px 12px 0px rgba(80,122,253,0.15); box-shadow: 0px 12px 12px 0px rgba(80,122,253,0.15);
margin-top: 15px; margin-top: 15px;
@ -226,12 +224,12 @@ onMounted(() => {
.list_classfiy_item { .list_classfiy_item {
margin-bottom: -2px; margin-bottom: -2px;
.list_title { .list_title {
font-size: 12px; font-size: 16px;
font-family: PingFang SC, PingFang SC-Regular; font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular; font-weight: Regular;
color: #999999; color: #999999;
line-height: 17px; line-height: 17px;
margin: 6px 0 12px 0; margin: 8px 0 10px 0;
font-weight: 500; font-weight: 500;
} }
@ -239,7 +237,7 @@ onMounted(() => {
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;
align-items: center; align-items: center;
margin: 16px 0; margin: 0 0 12px 0
} }
} }
} }
@ -268,7 +266,7 @@ onMounted(() => {
flex: 1; flex: 1;
overflow-y: hidden; overflow-y: hidden;
overflow-x: auto; overflow-x: auto;
margin: 9px 0 9px 0px; margin: -1px 0 9px 0px;
.tag { .tag {
font-weight: 500; font-weight: 500;
@ -277,7 +275,7 @@ onMounted(() => {
border: 1px solid #e4e7ed; border: 1px solid #e4e7ed;
border-radius: 12px; border-radius: 12px;
margin-right: 12px; margin-right: 12px;
font-size: 13px; font-size: 16px;
font-family: PingFang SC, PingFang SC-Regular; font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular; font-weight: Regular;
text-align: left; text-align: left;

@ -78,7 +78,7 @@ const finishPackageModal = ref(null)
const loading = ref(false) const loading = ref(false)
const message = useMessage() const message = useMessage()
const totalCount = ref(0) const totalCount = ref(0)
const loadref=ref(true)
const sortBy: PictureSortParam = { const sortBy: PictureSortParam = {
orderbyname: 'desc', orderbyname: 'desc',
orderbyvalue: 'pictureResult', orderbyvalue: 'pictureResult',
@ -107,14 +107,15 @@ const listStyle = computed(() => {
height: `${deviceHeight.value}px`, height: `${deviceHeight.value}px`,
} }
}) })
async function init() { async function inittask() {
let result = await getLastCheckNox() let result = await getLastCheckNox()
console.log(result.data) console.log(result.data)
if(result.data){ if(result.data){
let res=await getCheckDuplicateStatusx({checkDuplicateNo:result.data}) let res=await getCheckDuplicateStatusx({checkDuplicateNo:result.data})
if(res.data.status==1){ if(res.data.status==1){
const checkingTaskModal = checkingTaskModalRef.value as any const checkingTaskModal = checkingTaskModalRef.value as any
checkingTaskModal.showModal() checkingTaskModal.showModal()
loadref.value=false
} }
} }
} }
@ -169,14 +170,7 @@ onBeforeMount(async () => {
cols.value = 5 cols.value = 5
}) })
onUpdated(() => {
init()
// nextTick(() => {
// setTimeout(() => {
// layout()
// }, 50)
// })
})
const timeRange = ref('') const timeRange = ref('')
const timeLabel = computed(() => { const timeLabel = computed(() => {
@ -406,6 +400,7 @@ const gridMinHeight = computed(() => {
}) })
async function oneCheck() { async function oneCheck() {
loadref.value=false
const asideVal = cloneDeep(configStore.getAsideValue) const asideVal = cloneDeep(configStore.getAsideValue)
asideVal.upUserName = searchValue.value asideVal.upUserName = searchValue.value
@ -434,9 +429,11 @@ async function oneCheck() {
configStore.setTimeNum(calNum.value) configStore.setTimeNum(calNum.value)
if (checkTaskStatus.value === 2 || checkTaskStatus.value === 3) { if (checkTaskStatus.value === 2 || checkTaskStatus.value === 3) {
if (checkTaskStatus.value === 2) if (checkTaskStatus.value === 2)
message.success('任务执行完毕,正在刷新数据...') { message.success('任务执行完毕,正在刷新数据...')
else message.error('查询异常') loadref.value=true
}else{ message.error('查询异常')
loadref.value=true
}
tasksLoadingModal.closeOnlyModal() tasksLoadingModal.closeOnlyModal()
configStore.setTimeNum(100) configStore.setTimeNum(100)
if (timer.value) if (timer.value)
@ -529,6 +526,7 @@ async function commitHandler(settingParam) {
} }
onMounted(() => { onMounted(() => {
inittask()
emitter.on('filter', refreshHandler) emitter.on('filter', refreshHandler)
// emitter.on("filter", (searchId)=>{ // emitter.on("filter", (searchId)=>{
// console.log("emitter on filter" + searchId) // console.log("emitter on filter" + searchId)
@ -676,10 +674,13 @@ function refresh(val?: any) {
checkingTaskModal.closeModal() checkingTaskModal.closeModal()
isRefresh.value = false isRefresh.value = false
if (checkTaskStatus.value === 2) if (checkTaskStatus.value === 2)
message.success('任务执行完毕,正在刷新数据...') {
else message.error('查询异常') message.success('任务执行完毕,正在刷新数据...')
loadref.value=true
if (timer.value) }
else{ message.error('查询异常')
loadref.value=true
}if (timer.value)
clearInterval(timer.value) clearInterval(timer.value)
reset() reset()
loadMore() loadMore()
@ -702,6 +703,7 @@ function cancel() {
checkDuplicateNo.value = '' checkDuplicateNo.value = ''
checkTaskStatus.value = null checkTaskStatus.value = null
message.success('查重任务取消成功') message.success('查重任务取消成功')
loadref.value=true
} }
}) })
} }
@ -776,11 +778,18 @@ defineExpose({
</div> </div>
<div class="flex-btn-icon"> <div class="flex-btn-icon">
<SvgIcon <SvgIcon
v-show="checkTaskStatus !== 2" v-show="checkTaskStatus !== 2&& loadref"
style="cursor: pointer" style="cursor: pointer"
size="105" size="105"
name="yijianchachong" name="yijianchachong"
@click="oneCheck" @click="oneCheck"
/>
<SvgIcon
v-show="checkTaskStatus !== 2&& !loadref"
style="cursor:not-allowed"
size="105"
name="yijianchachong"
/> />
<SvgIcon <SvgIcon
v-show="checkTaskStatus === 2" v-show="checkTaskStatus === 2"
@ -798,7 +807,7 @@ defineExpose({
</n-dropdown> </n-dropdown>
</div> </div>
</div> </div>
<div class="wrapper-content" style="margin-bottom: 16px;"> <div class="wrapper-content" >
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
<div class="form"> <div class="form">
<n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click"> <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">

@ -56,15 +56,9 @@ defineExpose({
<!-- <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;"> --> <!-- <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;"> -->
<div <div
v-if="show" v-if="show"
style=" :style="!isFold?
position: fixed; 'position: fixed; right: 16px;bottom: 16px;float: left;z-index: 1002;width: 360px;height: 157px;':
right: 16px; 'position: fixed; right: 16px;bottom: -70px;float: left;z-index: 1002;width: 360px;height: 157px;'"
bottom: 16px;
float: left;
z-index: 1002;
width: 360px;
height: 157px;
"
> >
<n-card <n-card
:style="cardStyle" :style="cardStyle"

@ -35,8 +35,7 @@ useKeydown('enter', closeLoginModal)
flex-direction: row; flex-direction: row;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
margin-bottom: 16px
} }
::v-deep .aside{
height: 854px !important;
}
</style> </style>

@ -1342,7 +1342,7 @@ function cancel() {
<CustomSettingModal ref="CustomSettingModalRef" @on-ok="getDetail" /> <CustomSettingModal ref="CustomSettingModalRef" @on-ok="getDetail" />
<img-detail-modal ref="imgdetailref" @passfun="passfun" @nopassfun="nopassfun"/> <img-detail-modal ref="imgdetailref" @passfun="passfun" @nopassfun="nopassfun"/>
<MapModal ref="MapModalRef"/> <MapModal ref="MapModalRef"/>
<CheckingTaskModal ref="checkingTaskModalRef" @cancel="cancel" />
</div> </div>
</template> </template>

@ -79,9 +79,8 @@ defineExpose({
.topline{ .topline{
background: #E8E8E8; background: #E8E8E8;
height: 0.5px; height: 0.5px;
width: 800px; width: 805px;
margin-left: -22px; margin-left: -37px;
//position: absolute;
top: 85px; top: 85px;
} }
.close{ .close{

@ -1017,7 +1017,7 @@ defineExpose({
@show="onRejectDialog" @show="onRejectDialog"
@success="reloadDetailInfo" @success="reloadDetailInfo"
/> />
<CheckingTaskModal ref="checkingTaskModalRef" @cancel="cancel" />
</div> </div>
</template> </template>

Loading…
Cancel
Save