fix:样式修改 #326

Merged
yaoshuli merged 1 commits from fix/change_task into test 1 year ago

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>下拉切换</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-2504.000000, -6121.000000)">
<g id="下拉切换" transform="translate(2504.000000, 6121.000000)">
<circle id="椭圆形" fill="#F1F4FB" cx="32" cy="32" r="32"></circle>
<g id="4.Icon图标/Solid/Solid-down" transform="translate(16.000000, 24.000000)" fill="#737C8D">
<path d="M3.57766074,0.00356491311 C1.60177327,0.00381274166 1.0016225,1.25485215 2.22640041,2.78436987 L13.7856026,17.2196438 C15.0152096,18.7551921 17.0121238,18.7489104 18.2434766,17.2085638 L29.7685264,2.79143616 C31.0009352,1.24976854 30.391185,0.000201787956 28.4223393,0.000448733286 L3.57766074,0.00356491311 Z" id="蒙版"></path>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -14,6 +14,7 @@ import { audit } from '@/api/task/task'
import DataHeader from '@/components/DataHeader/index.vue'
import NotPassed from '@/components/Approval/NotPassed.vue'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import { el } from 'date-fns/locale'
const props = defineProps({
@ -41,6 +42,7 @@ const total = ref(0)
const scrollContainer = ref(null)
const tableData = ref<any>([])
const finalStore = useFinal()
const valuetwo=ref(false)
let num = 1
const pagination = reactive({
page: 1,
@ -508,7 +510,46 @@ watch(
},
{ deep: true },
)
watch(
() => valuetwo.value,
(newVal, oldVal) => {
let newlist=[]
if(valuetwo.value){
tableData.value.map((item)=>{
let ooo=[]
for (let i=0; i<item.length;i++){
console.log(item[i])
item[i].showcheck=true
ooo.push(item[i])
}
// console.log(item)
item=ooo
newlist.push(item)
})
tableData.value=newlist
}else{
tableData.value.map((item)=>{
let ooo=[]
for (let i=0; i<item.length;i++){
console.log(item[i])
item[i].showcheck=false
ooo.push(item[i])
}
// console.log(item)
item=ooo
newlist.push(item)
})
tableData.value=newlist
}
},
{ deep: true },
)
defineExpose({
initData,
})
@ -616,6 +657,9 @@ defineExpose({
<span>提报人排序</span><SvgIcon style="margin-left: 6px" name="sort" size="13" />
</div>
</div>
<div class="checkall"> <n-checkbox v-model:checked="valuetwo">
全选
</n-checkbox></div>
<div style="width: 3vw">
<!-- <SvgIcon name="magnifying-1" size="18" style="margin-right: 8px" />
<SvgIcon
@ -759,6 +803,10 @@ defineExpose({
</template>
<style scoped lang="less">
.checkall{
position: absolute;
right: 8px;
}
.wrapper {
display: flex;
flex: 1;

@ -21,6 +21,11 @@ const props = defineProps({
default: '',
required: true,
},
icontype:{
type: String,
default: 0,
required: true,
}
})
const emit = defineEmits<{
(e: 'show-filter'): void
@ -251,6 +256,11 @@ function handleScroll(event) {
}
}
function moveoneEnd() {
data.value.forEach((v, index) => {
sort(v.id, index)
})
}
function moveEnd() {
unData.value.forEach((v, index) => {
sort(v.id, index)
@ -269,7 +279,14 @@ defineExpose({
<template>
<div class="wrapper" >
<div class="wrapper-left">
<svg-icon name="shield" size="32" />
<svg-icon v-if="icontype==0" name="shield" size="32" />
<SvgIcon
v-if="icontype==1"
:style="{ marginLeft: '5px' }"
name="xiala"
size="16"
color="#999999"
/>
<n-popover
ref="popover"
:style="{ padding: '0px' }"
@ -334,11 +351,11 @@ defineExpose({
<ul ref="el" class="wrapper-left-list" @scroll="handleScroll">
<VueDraggable
v-model="data"
class="draggable-ul"
:animation="150"
group="shared"
@end="moveoneEnd"
>
<li
v-for="(item, index) in data"

@ -274,6 +274,7 @@ function handleOk(item: any) {
</div> -->
<!-- 高级筛选 -->
<AdvanceFilter
:icontype=1
v-show="!showSearch"
ref="AdvanceFilterRef"
:type="2"

@ -4,7 +4,7 @@ import {
onMounted,
onUnmounted,defineProps,
reactive,
ref,
ref, h,
unref,
watch,
} from 'vue'
@ -24,6 +24,7 @@ import { getAllfieldList, getfieldList } from '@/api/home/filter'
import { TASK_STATUS_OBJ } from '@/enums/index'
import { useFinal } from '@/store/modules/final'
import { useDataHeaderStore } from '@/store/modules/DataHeader'
import { EllipsisHorizontal, EyeOutline as EyeOutlineIcon } from '@vicons/ionicons5'
import {
audit,
dubiousfileyd,
@ -39,6 +40,9 @@ import bgLoading from '@/assets/images/bg-loading.png'
import { useKeydown } from '@/hooks/event/useKeydown'
import CheckingTaskModal from '@/views/home/content/modal/CheckingTaskModal.vue'
import { getCheckDuplicateStatus, getCheckDuplicateStatusx, getLastCheckNox, removeCheckDuplicate } from '@/api/home/main'
import type { Component } from 'vue'
import { NIcon, } from 'naive-ui'
import { Download as DownloadIcon, Upload as UploadIcon } from '@vicons/tabler'
const props = defineProps({
@ -131,6 +135,28 @@ const fullscreenStylestwo = computed<any>(() => ({
left: isFullScreen.value ? '0' : '',
zIndex: isFullScreen.value ? '160' : '',
}))
function renderIcon(icon: Component) {
return () => {
return h(NIcon, null, {
default: () => h(icon),
})
}
}
const dropdownOptions = ref([
{
label: '导入任务数据',
key: 'profile',
icon: renderIcon(DownloadIcon),
},
{
label: '导出任务数据',
key: 'editProfile',
icon: renderIcon(DownloadIcon),
},
])
async function init() {
const result = await getLastCheckNox()
if (result.data) {
@ -750,6 +776,13 @@ function cancel() {
<SvgIcon style="margin-right: 6px" size="22" name="batch" />
批量审批
</div>
<n-dropdown trigger="hover" placement="bottom-start" :options="dropdownOptions">
<span class="expand-icon">
<Icon style="position: relative; top: 2px">
<EllipsisHorizontal style="color: #507afd; width: 14px;margin-top: 7px;margin-left: 8.5px;" />
</Icon>
</span>
</n-dropdown>
<!-- <n-popover
ref="popover"
:style="{ padding: '0px' }"
@ -2150,4 +2183,18 @@ function cancel() {
background: #ff4e4f;
}
}
.expand-icon {
display: block;
margin-left: 10px;
width: 30px;
height: 30px;
line-height: 30px;
background: linear-gradient(
144deg,
rgba(115, 167, 249, 0.1) 0%,
rgba(62, 110, 241, 0.1) 96%
);
border-radius: 8px;
text-align: center;
}
</style>

Loading…
Cancel
Save