feat: 悬浮逻辑修复,任务列表样式调整

pull/1/head
刘释隆 1 year ago
parent ef40bc7c09
commit 2d9bb1a802

@ -2,7 +2,8 @@
import { onMounted, ref } from "vue";
const item = {
img: "/src/assets/images/test.png",
// img: "/src/assets/images/test.png",
img:'http://47.93.59.251/api/image/thumbnail_1752999610491604992.jpeg',
checked: false,
title: "YP4567890545",
date: "2023-12-19 12:09:18",
@ -10,7 +11,7 @@ const item = {
const data = ref<any[]>([]);
onMounted(() => {
for (let i = 0; i < 10; i++) {
for (let i = 0; i < 20; i++) {
data.value.push(item as any);
}
});
@ -36,7 +37,7 @@ onMounted(() => {
:key="index"
:style="index == 2 ? 'color:#02C984' : 'color:#507AFD'"
>
待确认
{{ index==1?'待确认':'张思' }}
</div>
</div>
</div>
@ -85,8 +86,7 @@ onMounted(() => {
.title,
.date {
font-size: 11px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: Medium;
font-weight: bolder;
text-align: left;
color: #323233;
line-height: 16px;
@ -101,8 +101,7 @@ onMounted(() => {
width: 31px;
height: 14px;
font-size: 10px;
font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular;
font-weight: bolder;
text-align: left;
// color: #507afd;
line-height: 14px;
@ -118,16 +117,14 @@ onMounted(() => {
justify-content: flex-end;
.resovle_action {
font-size: 12px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: Medium;
font-weight: bolder;
text-align: left;
color: #507afd;
line-height: 17px;
}
.reject_action {
font-size: 12px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: Medium;
font-weight: bolder;
text-align: left;
color: #ff4e4f;
line-height: 17px;

@ -15,9 +15,10 @@ const showList = ref(false);
<Aside />
<!-- 内容 -->
<Content @changeShow="showList=true" v-if="!showList"/>
<Content @changeShow="showList=true" />
<!-- 任务管理 -->
<ListContent v-else />
<!-- TODO:本地演示即可 上传注释注释 -->
<!-- <ListContent /> -->
</div>
</template>

@ -310,6 +310,10 @@ const currentTaskId = computed(() => {
function overTaskHandle() {
const item = taskDetailInfo.value
if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
overTask.value = null;
return;
}
if (validate([item]) == null && batch.value === false)
overTask.value = item

@ -7,7 +7,7 @@ import imagesloaded from "imagesloaded";
import ConfrimModal from "../modal/ConfrimModal.vue";
import type { PictureSortParam, SetTFParam } from "/#/api";
import { useWorkOrder } from "@/store/modules/workOrder";
import { formatToDateHMS } from '@/utils/dateUtil'
import { formatToDateHMS } from "@/utils/dateUtil";
import {
clearTF,
getPackageTaskList,
@ -341,6 +341,11 @@ async function clearMark() {
}
function overTaskHandelr(item: any) {
if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
overTask.value = null;
return;
}
if (validate([item]) == null && batch.value === false) overTask.value = item;
}
@ -455,9 +460,9 @@ function previewHandler(event: MouseEvent) {
/>
</div>
<div class="time">
<SvgIcon color="#FFF" size="16" name="time" />
<span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
</div>
<SvgIcon color="#FFF" size="16" name="time" />
<span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
</div>
<!-- 右下信息 -->
<div class="info">
<n-grid x-gap="16" y-gap="0" :cols="12">
@ -579,6 +584,10 @@ function previewHandler(event: MouseEvent) {
class="img-wrapper"
:style="{ 'background-image': `url(${item.thumburl})` }"
/>
<div class="time">
<SvgIcon color="#FFF" size="16" name="time" />
<span>{{ formatToDateHMS(item.createdate || 0) }}</span>
</div>
<div class="check">
<n-checkbox
v-show="batch"
@ -923,12 +932,12 @@ function previewHandler(event: MouseEvent) {
}
.time {
position: absolute;
z-index: 3;
left: 2%;
bottom: 2%;
color: #fff;
display: flex;
align-items: center;
}
position: absolute;
z-index: 3;
left: 5%;
bottom: 5%;
color: #fff;
display: flex;
align-items: center;
}
</style>

Loading…
Cancel
Save