diff --git a/src/assets/images/login/logo.png b/src/assets/images/login/logo.png
index 03e2786..d921560 100644
Binary files a/src/assets/images/login/logo.png and b/src/assets/images/login/logo.png differ
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index e0232fc..c8510ec 100644
Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index b53a213..39edb56 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -327,6 +327,7 @@ defineExpose({
:options="logicOptions"
/>
+
{}:removeCondition(index)"
style=" padding: 0;
margin-left: 17px;"
>
@@ -377,7 +378,7 @@ defineExpose({
-
-
- 添加筛选条件
+ 添加筛选条件
+
+
+
+
@@ -521,6 +524,39 @@ defineExpose({
left: 0;
bottom: 69.5px;
}
+.sssscroll{
+ height: 145px;
+ overflow: auto;
+margin-bottom: 40px;
+}
+/* 定义滚动条的宽度及背景颜色 */
+ ::-webkit-scrollbar {
+
+ position: fixed;
+ width: 2px; /* for vertical scrollbars */
+ height: 10px; /* for horizontal scrollbars */
+ background: #f1f1f1;
+ }
+
+ /* 定义滚动条轨道的样式 */
+ ::-webkit-scrollbar-track {
+
+ background-color: #e1e1e1;
+ border-radius: 10px; /* 圆角 */
+ }
+
+ /* 定义滚动条滑块的样式 */
+ ::-webkit-scrollbar-thumb {
+
+ background-color: #888;
+ border-radius: 10px; /* 圆角 */
+ }
+
+ /* 滑块hover时的样式 */
+ ::-webkit-scrollbar-thumb:hover {
+
+ background-color: #555;
+ }
::v-deep(.n-form-item .n-form-item-label) {
font-size: 14px;
color: #666666;
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index c6427df..8369c40 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -379,6 +379,7 @@ if(formValue.name){
:options="logicOptions"
/>
+
{}:removeCondition(index)"
style=" padding: 0;
margin-left: 17px;"
>
@@ -430,7 +431,7 @@ if(formValue.name){
-
-
-
+
+
+
@@ -600,6 +603,39 @@ if(formValue.name){
.modal_wrapper {
padding: 14px 14px 0 14px !important;
}
+.sssscroll{
+ height: 145px;
+ overflow: auto;
+
+}
+/* 定义滚动条的宽度及背景颜色 */
+ ::-webkit-scrollbar {
+
+ position: fixed;
+ width: 2px; /* for vertical scrollbars */
+ height: 10px; /* for horizontal scrollbars */
+ background: #f1f1f1;
+ }
+
+ /* 定义滚动条轨道的样式 */
+ ::-webkit-scrollbar-track {
+
+ background-color: #e1e1e1;
+ border-radius: 10px; /* 圆角 */
+ }
+
+ /* 定义滚动条滑块的样式 */
+ ::-webkit-scrollbar-thumb {
+
+ background-color: #888;
+ border-radius: 10px; /* 圆角 */
+ }
+
+ /* 滑块hover时的样式 */
+ ::-webkit-scrollbar-thumb:hover {
+
+ background-color: #555;
+ }
::v-deep(.n-form-item .n-form-item-label) {
font-size: 14px;
color: #666666;
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 00d7b1c..120778f 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -55,6 +55,7 @@ import {
import bgLoading from '@/assets/images/bg-loading.png'
+const show=ref(false)
const listData = ref([])
const timer = ref()
const showClose = ref(false)
@@ -154,7 +155,9 @@ async function inittask() {
useInfiniteScroll(
el as any,
() => {
+ if(configStore.asideValue!=null){
loadMore()
+ }
},
{ distance: 10, canLoadMore: () => canloadMore },
)
@@ -221,6 +224,7 @@ watch(() => collapse.value, (newVal, oldVal) => {
})
const asideLoadMore = debounce(() => {
+
reset()
loadMore()
}, 400)
@@ -229,6 +233,7 @@ watch(
() => searchValue.value,
async (newVal, oldVal) => {
if (newVal) {
+
isInitSeaerch.value = true
// pagination.pageNo = 0
// const more = await featchList()
@@ -258,6 +263,7 @@ watch(
async (newVal, oldVal) => {
if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) {
// reset()
+
asideLoadMore()
}
},
@@ -301,6 +307,7 @@ async function featchList(userSearchId?: string) {
...contentParams,
...params,
...sortObj,
+ ...configStore.asideValue,
checkDuplicateNo: checkDuplicateNo.value,
upUserName: searchValue,
})
@@ -566,7 +573,8 @@ watch(timeRange, () => {
watch(
() => configStore.asideValue,
(newVal, oldVal) => {
- refreshHandler()
+ refreshHandler()
+
},
{ deep: true },
)
@@ -785,6 +793,14 @@ function previewImageUrl(img1, img2) {
nodes.next,
]
};
+ function handleMouseEnter(){
+
+ show.value=true
+ }
+ function handleMouseLeave(){
+
+show.value=false
+ }
defineExpose({
showLoginSuccessModal,
closeLoginSuccessModal,listData
@@ -1068,11 +1084,20 @@ defineExpose({
- {{ item.imgName }}
+
+
{{ item.imgName }}
+
+
{{ item.imgName }}
+
+
+
{{ item.imgName }}
+
(() => ({
- width: isFullScreen.value ? '99vw' : '',
+ width: isFullScreen.value ? '100vw' : '',
height: isFullScreen.value ? '100vh' : '',
position: isFullScreen.value ? 'fixed' : '',
top: isFullScreen.value ? '0' : '',
left: isFullScreen.value ? '0' : '',
zIndex: isFullScreen.value ? '100' : '',
+ marginLeft: isFullScreen.value ? '0px' : '',
+ marginRight: isFullScreen.value ? '0px' : '',
}))
const fullscreenStylestwo = computed
(() => ({
- width: isFullScreen.value ? '99vw' : '',
+ width: isFullScreen.value ? '100vw' : '',
height: isFullScreen.value ? '100vh' : '',
position: isFullScreen.value ? 'fixed' : '',
top: isFullScreen.value ? '0' : '',
left: isFullScreen.value ? '0' : '',
zIndex: isFullScreen.value ? '160' : '',
+ marginLeft: isFullScreen.value ? '0px' : '',
+ marginRight: isFullScreen.value ? '0px' : '',
}))
function renderIcon(icon: Component) {
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index f5ff7a2..d10bcf1 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -29,7 +29,8 @@ defineProps({
图片大小 |
- {{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb
+ {{data?.pictureInfo?.imgSize}}
+ {{ data?.pictureInfo?.imgSize>0?(data?.pictureInfo?.imgSize / 1024).toFixed(2)+'KB':'' }}
|
图片尺寸 |
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index 186afd9..a6ae62f 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -319,6 +319,7 @@ defineExpose({
:rules="rules"
require-mark-placement="left"
>
+
+
{}:removeCondition(index)"
style=" padding: 0;
margin-left: 17px;"
>
@@ -393,7 +395,7 @@ defineExpose({
-
-
添加筛选条件
+
+
+
+
@@ -544,6 +548,39 @@ defineExpose({
.modal_wrapper {
padding: 14px 14px 0 14px !important;
}
+.sssscroll{
+ height: 145px;
+ overflow: auto;
+
+}
+/* 定义滚动条的宽度及背景颜色 */
+ ::-webkit-scrollbar {
+
+ position: fixed;
+ width: 2px; /* for vertical scrollbars */
+ height: 10px; /* for horizontal scrollbars */
+ background: #f1f1f1;
+ }
+
+ /* 定义滚动条轨道的样式 */
+ ::-webkit-scrollbar-track {
+
+ background-color: #e1e1e1;
+ border-radius: 10px; /* 圆角 */
+ }
+
+ /* 定义滚动条滑块的样式 */
+ ::-webkit-scrollbar-thumb {
+
+ background-color: #888;
+ border-radius: 10px; /* 圆角 */
+ }
+
+ /* 滑块hover时的样式 */
+ ::-webkit-scrollbar-thumb:hover {
+
+ background-color: #555;
+ }
::v-deep(.n-form-item .n-form-item-label) {
font-size: 14px;
color: #666666;
|