pull/44/head
Dragon 1 year ago
parent 43ff3d4dec
commit 6bf748963e

@ -64,7 +64,7 @@ export async function repetitionTask() {
}
/**
*
*
* @returns
*/
export async function getRepeatList(params: FinalParam) {
@ -76,8 +76,8 @@ export async function getRepeatList(params: FinalParam) {
const { data: { records, totalPage, totalCount } } = res
return {
pageCount: totalPage,
pageCount: 3,
data: records,
totalCount,
totalCount: 20,
}
}

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711952592553" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5038" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M178.016 592a16 16 0 0 1 16 16l-0.016 224h635.872V608a16 16 0 0 1 16-16h48a16 16 0 0 1 16 16v272a32 32 0 0 1-29.6 31.92l-2.4 0.08H146.016a32 32 0 0 1-32-32V608a16 16 0 0 1 16-16h48zM514.368 129.024c7.76 0.32 15.424 3.424 21.344 9.344l200.72 200.736a16 16 0 0 1 0 22.624l-33.936 33.936a16 16 0 0 1-22.624 0L552 267.792v394.688a16 16 0 0 1-16 16h-48a16 16 0 0 1-16-16V267.68l-127.984 128a16 16 0 0 1-22.624 0l-33.936-33.952a16 16 0 0 1 0-22.624L488.16 138.368c5.92-5.92 13.584-9.04 21.328-9.344z" p-id="5039" fill="#666666"></path></svg>

After

Width:  |  Height:  |  Size: 866 B

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711952656753" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5379" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M184.224 514.112c80.672 145.056 199.472 227.936 327.744 227.936 128.288 0 247.088-82.88 327.808-227.936-80.72-145.056-199.536-227.872-327.792-227.872-128.288 0-247.088 82.816-327.76 227.872z m327.744 300.24c-159.28 0-310.432-106.8-404.368-285.648-4.8-9.12-4.8-20.048 0-29.184 93.92-178.848 245.12-285.632 404.368-285.632 159.28 0 310.464 106.784 404.432 285.632 4.8 9.136 4.8 20.048 0 29.184-93.968 178.848-245.152 285.648-404.432 285.648zM512 418.992c-51.696 0-93.728 42.656-93.728 95.136s42.032 95.12 93.728 95.12 93.728-42.656 93.728-95.136S563.68 418.976 512 418.976m0 255.616c-87.136 0-158.08-72-158.08-160.48 0-88.512 70.928-160.464 158.08-160.464 87.168 0 158.128 71.952 158.128 160.48 0 88.448-70.96 160.464-158.128 160.464" p-id="5380"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -31,7 +31,7 @@ const actions = computed(() => {
<div :data-id="id">
<n-button
v-for="(action, index) in actions" :key="index" class="normal"
:class="{ gap: index !== 0, reject: index === 1 }" text @click="(trigger(action) as any)"
:class="{ gap: index !== 0, reject: action.key === 'reject' }" text @click="(trigger(action) as any)"
>
{{ action.label }}
</n-button>

@ -14,6 +14,7 @@ import {
} from 'vue'
import { NDataTable, useDialog, useMessage } from 'naive-ui'
import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
import { useRouter } from 'vue-router'
import {
ListAction,
StatusItem,
@ -21,7 +22,7 @@ import {
import { RejectModal } from './index'
import { useDictionary } from '@/store/modules/dictonary'
import type { RowData } from '@/config/final'
import { getFinalList, getRepeatList } from '@/api/final'
import { getRepeatList } from '@/api/final'
import { formatToDateHMS } from '@/utils/dateUtil'
import { audit } from '@/api/task/task'
import NotPassed from '@/components/Approval/NotPassed.vue'
@ -35,6 +36,7 @@ const show = ref(false)
const izstatusList = ref([])
const dialog = useDialog()
const checkedRowKeys = ref([])
const router = useRouter()
onBeforeMount(() => {
dicStore.fetchizstatusListt()
@ -59,7 +61,7 @@ const columns: DataTableColumns<RowData> = [
},
},
{
title: '任务Id',
title: '任务ID',
key: 'id',
fixed: 'left',
width: 180,
@ -234,6 +236,7 @@ function actionHandler(action: any, row: any) {
const { key } = action
switch (key) {
case 'view':
goDetail(row)
break
case 'reset':
// resetHandler()
@ -355,6 +358,10 @@ function reload() {
checkedRowKeys.value = []
}
function goDetail(row) {
router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
}
defineExpose({
showModal,
})
@ -373,45 +380,45 @@ defineExpose({
aria-modal="true"
>
<div class="wrapper">
<span class="wrapper-title">重复任务</span>
<div class="wrapper-bar">
<div class="wrapper-info">
<span :style="{ 'margin-left': '18px' }">任务信息</span>
<div class="card-top">
<span class="wrapper-title">重复任务</span>
<div class="wrapper-bar">
<div class="wrapper-info">
<span>任务信息</span>
</div>
</div>
<div class="batch">
<img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
<SvgIcon size="24" name="vs" />
<img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
</div>
<div class="wrapper-content">
<NDataTable
ref="tableRef"
v-model:checked-row-keys="checkedRowKeys"
remote
:columns="columnsRef"
:scroll-x="1250"
:max-height="maxHeight"
:data="tableData"
:loading="loading"
:pagination="pagination"
:row-key="rowKey"
@update:page="handlePageChange"
@update-page-size="handlePageSizeChange"
@update:checked-row-keys="handleCheck"
/>
</div>
</div>
<div class="batch">
<img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
<SvgIcon size="24" name="vs" />
<img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
</div>
<div class="wrapper-content">
<NDataTable
ref="tableRef"
v-model:checked-row-keys="checkedRowKeys"
remote
:columns="columnsRef"
:scroll-x="1250"
:max-height="maxHeight"
:data="tableData"
:loading="loading"
:pagination="pagination"
:row-key="rowKey"
@update:page="handlePageChange"
@update-page-size="handlePageSizeChange"
@update:checked-row-keys="handleCheck"
/>
</div>
</div>
<template #footer>
<div class="wrapper-footer">
<n-button type="info" @click="handleSumbit">
确认
</n-button>
<n-button secondary style="margin-left: 15px" @click="closeModal">
取消
</n-button>
</div>
</template>
<div class="wrapper-footer">
<n-button class="btn1" type="info" @click="handleSumbit">
确定
</n-button>
<n-button secondary class="btn" style="margin-left: 15px" @click="closeModal">
取消
</n-button>
</div>
</n-card>
</n-modal>
<RejectModal ref="rejectModalRef" @commit="rejectHandler" />
@ -435,9 +442,15 @@ defineExpose({
display: flex;
flex-direction: column;
.card-top{
padding: 24px;
}
&-title {
font-weight: bold;
font-size: 16px;
font-size: 18px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: 600;
color: #333333;
}
&-bar {
@ -455,19 +468,31 @@ defineExpose({
&-footer {
display: flex;
justify-content: flex-end;
border-top: 0.5px solid #d9d9d9;
padding: 15px 24px;
}
&-info {
font-weight: bold;
position: relative;
height: 29px;
background: #f8f8f8;
font-size: 16px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: 600;
color: #333333;
display: flex;
align-items: center;
padding-left: 14px;
&:before {
background-color: #1980ff;
background-color: #507AFD;
content: "";
width: 5px;
border-radius: 2px;
top: 0;
bottom: 0;
height: 18px;
width: 4px;
border-radius: 3px;
top: 5px;
left: 0;
position: absolute;
}
}
@ -488,4 +513,21 @@ defineExpose({
--n-padding-top: 0px;
--n-padding-bottom: 12px;
}
::v-deep(.n-card__content) {
padding: 0!important;
}
::v-deep(.n-data-table .n-data-table-td) {
padding: 10px 12px!important;
}
.btn1{
background: #507AFD;
}
.btn{
border: 1px solid #cad2dd;
background-color: #fff;
}
</style>

@ -17,7 +17,6 @@ import {
import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
import { useRoute, useRouter } from 'vue-router'
import {
Action,
CustomTabelModal,
ImportExcelModal,
ListAction,
@ -784,11 +783,13 @@ async function refreshHandler(searchId?: any) {
trigger="click"
>
<template #trigger>
<SvgIcon style="cursor: pointer" size="20" name="more-ver" />
<div class="icon-wrap">
<SvgIcon size="20" name="more-blue" />
</div>
</template>
<ul class="wrapper-header-action">
<li @click="importHandler">
<SvgIcon size="20" name="download" /><span style="margin-left: 5px">批量导入数据</span>
<SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
</li>
<li @click="exportHandler">
<SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
@ -796,6 +797,9 @@ async function refreshHandler(searchId?: any) {
<li>
<SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
</li>
<!-- <li>
<SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
</li> -->
</ul>
</n-popover>
</div>
@ -864,6 +868,7 @@ async function refreshHandler(searchId?: any) {
.batch {
display: flex;
align-items: center;
margin-right: 10px;
.btn-approval{
width: 68px;
@ -875,6 +880,17 @@ async function refreshHandler(searchId?: any) {
margin-left: 16px;
}
}
.icon-wrap {
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
background: rgba(80, 122, 253, 0.1);
border-radius: 8px;
cursor: pointer;
}
.wrapper {
display: flex;
flex: 1;
@ -901,7 +917,7 @@ async function refreshHandler(searchId?: any) {
.xjcc {
font-weight: bold;
color: #6a80fc;
color: #507AFD;
margin-right: 20px;
}

Loading…
Cancel
Save