guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix:样式修改

Browse Source
pull/345/head
lihui_ocr 2 years ago
parent edbf9d687c
commit 48f0145292
6 changed files with 139 additions and 18 deletions
Show Stats Download Patch File Download Diff File

46
src/views/final/comp/NewFilterModal.vue
Unescape View File

@ -327,6 +327,7 @@ defineExpose({
:options="logicOptions" :options="logicOptions"
/> />
</n-form-item> </n-form-item>
<div class="sssscroll">
<n-form-item <n-form-item
v-for="(item, index) in formValue.conditions" v-for="(item, index) in formValue.conditions"
:key="index" :key="index"
@ -369,7 +370,7 @@ defineExpose({
<n-button <n-button
:style="noBorderInput" :style="noBorderInput"
icon-placement="right" icon-placement="right"
@click="removeCondition(index)" @click="index==0?()=>{}:removeCondition(index)"
style=" padding: 0; style=" padding: 0;
margin-left: 17px;" margin-left: 17px;"
> >
@ -377,7 +378,7 @@ defineExpose({
<!-- <SvgIcon size="24" name="close" color="#F00"/> <!-- <SvgIcon size="24" name="close" color="#F00"/>
--> -->
<svg <svg
:style="index==0?'cursor: not-allowed':''"
width="24px" width="24px"
height="24px" height="24px"
viewBox="0 0 64 64" viewBox="0 0 64 64"
@ -426,12 +427,14 @@ defineExpose({
</div> </div>
</template> </template>
</n-form-item> </n-form-item>
</n-form>
</div>
<div class="wrapper-new" @click="createCondition"> <div class="wrapper-new" @click="createCondition">
<SvgIcon size="16" name="addicon" style="margin-top: 3px;"/> <SvgIcon size="16" name="addicon" style="margin-top: 3px;"/>
<span style="margin-left: 8px;margin-bottom: 40px;">添加筛选条件</span> <span style="margin-left: 8px;">添加筛选条件</span>
</div>
</div>
</n-form>
</div> </div>
</div> </div>
<div class="bottomline"></div> <div class="bottomline"></div>
<template #footer> <template #footer>
@ -521,6 +524,39 @@ defineExpose({
left: 0; left: 0;
bottom: 69.5px; 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) { ::v-deep(.n-form-item .n-form-item-label) {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;

46
src/views/home/aside/comp/modals/NewFilterModal.vue
Unescape View File

@ -379,6 +379,7 @@ if(formValue.name){
:options="logicOptions" :options="logicOptions"
/> />
</n-form-item> </n-form-item>
<div class="sssscroll">
<n-form-item <n-form-item
v-for="(item, index) in formValue.conditions" v-for="(item, index) in formValue.conditions"
:key="index" :key="index"
@ -422,7 +423,7 @@ if(formValue.name){
<n-button <n-button
:style="noBorderInput" :style="noBorderInput"
icon-placement="right" icon-placement="right"
@click="removeCondition(index)" @click="index==0?()=>{}:removeCondition(index)"
style=" padding: 0; style=" padding: 0;
margin-left: 17px;" margin-left: 17px;"
> >
@ -430,7 +431,7 @@ if(formValue.name){
<!-- <SvgIcon size="24" name="close" color="#F00"/> <!-- <SvgIcon size="24" name="close" color="#F00"/>
--> -->
<svg <svg
:style="index==0?'cursor: not-allowed':''"
width="24px" width="24px"
height="24px" height="24px"
viewBox="0 0 64 64" viewBox="0 0 64 64"
@ -479,12 +480,14 @@ if(formValue.name){
</div> </div>
</template> </template>
</n-form-item> </n-form-item>
</n-form> <div class="wrapper-new" @click="createCondition">
</div>
<div class="wrapper-new" @click="createCondition">
<SvgIcon size="16" name="addicon" style="margin-top: 3px;"/> <SvgIcon size="16" name="addicon" style="margin-top: 3px;"/>
<span style="margin-left: 8px">添加筛选条件</span> <span style="margin-left: 8px">添加筛选条件</span>
</div> </div>
</div>
</n-form>
</div>
</div> </div>
<div class="bottomline"></div> <div class="bottomline"></div>
<template #footer> <template #footer>
@ -600,6 +603,39 @@ if(formValue.name){
.modal_wrapper { .modal_wrapper {
padding: 14px 14px 0 14px !important; 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) { ::v-deep(.n-form-item .n-form-item-label) {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;

9
src/views/home/content/Content.vue
Unescape View File

@ -155,7 +155,9 @@ async function inittask() {
useInfiniteScroll( useInfiniteScroll(
el as any, el as any,
() => { () => {
if(configStore.asideValue!=null){
loadMore() loadMore()
}
}, },
{ distance: 10, canLoadMore: () => canloadMore }, { distance: 10, canLoadMore: () => canloadMore },
) )
@ -222,6 +224,7 @@ watch(() => collapse.value, (newVal, oldVal) => {
}) })
const asideLoadMore = debounce(() => { const asideLoadMore = debounce(() => {
reset() reset()
loadMore() loadMore()
}, 400) }, 400)
@ -230,6 +233,7 @@ watch(
() => searchValue.value, () => searchValue.value,
async (newVal, oldVal) => { async (newVal, oldVal) => {
if (newVal) { if (newVal) {
isInitSeaerch.value = true isInitSeaerch.value = true
// pagination.pageNo = 0 // pagination.pageNo = 0
// const more = await featchList() // const more = await featchList()
@ -259,6 +263,7 @@ watch(
async (newVal, oldVal) => { async (newVal, oldVal) => {
if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) { if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) {
// reset() // reset()
asideLoadMore() asideLoadMore()
} }
}, },
@ -302,6 +307,7 @@ async function featchList(userSearchId?: string) {
...contentParams, ...contentParams,
...params, ...params,
...sortObj, ...sortObj,
...configStore.asideValue,
checkDuplicateNo: checkDuplicateNo.value, checkDuplicateNo: checkDuplicateNo.value,
upUserName: searchValue, upUserName: searchValue,
}) })
@ -567,7 +573,8 @@ watch(timeRange, () => {
watch( watch(
() => configStore.asideValue, () => configStore.asideValue,
(newVal, oldVal) => { (newVal, oldVal) => {
refreshHandler() refreshHandler()
}, },
{ deep: true }, { deep: true },
) )

8
src/views/task/content/Content.vue
Unescape View File

@ -125,20 +125,24 @@ let processItems: any[] = []
const isFullScreen = ref(false) const isFullScreen = ref(false)
const fullscreenStyles = computed<any>(() => ({ const fullscreenStyles = computed<any>(() => ({
width: isFullScreen.value ? '99vw' : '', width: isFullScreen.value ? '100vw' : '',
height: isFullScreen.value ? '100vh' : '', height: isFullScreen.value ? '100vh' : '',
position: isFullScreen.value ? 'fixed' : '', position: isFullScreen.value ? 'fixed' : '',
top: isFullScreen.value ? '0' : '', top: isFullScreen.value ? '0' : '',
left: isFullScreen.value ? '0' : '', left: isFullScreen.value ? '0' : '',
zIndex: isFullScreen.value ? '100' : '', zIndex: isFullScreen.value ? '100' : '',
marginLeft: isFullScreen.value ? '0px' : '',
marginRight: isFullScreen.value ? '0px' : '',
})) }))
const fullscreenStylestwo = computed<any>(() => ({ const fullscreenStylestwo = computed<any>(() => ({
width: isFullScreen.value ? '99vw' : '', width: isFullScreen.value ? '100vw' : '',
height: isFullScreen.value ? '100vh' : '', height: isFullScreen.value ? '100vh' : '',
position: isFullScreen.value ? 'fixed' : '', position: isFullScreen.value ? 'fixed' : '',
top: isFullScreen.value ? '0' : '', top: isFullScreen.value ? '0' : '',
left: isFullScreen.value ? '0' : '', left: isFullScreen.value ? '0' : '',
zIndex: isFullScreen.value ? '160' : '', zIndex: isFullScreen.value ? '160' : '',
marginLeft: isFullScreen.value ? '0px' : '',
marginRight: isFullScreen.value ? '0px' : '',
})) }))
function renderIcon(icon: Component) { function renderIcon(icon: Component) {

3
src/views/task/content/PictureTable.vue
Unescape View File

@ -29,7 +29,8 @@ defineProps({
<tr> <tr>
<th>图片大小</th> <th>图片大小</th>
<td class="blue"> <td class="blue">
{{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb {{data?.pictureInfo?.imgSize}}
{{ data?.pictureInfo?.imgSize>0?(data?.pictureInfo?.imgSize / 1024).toFixed(2)+'KB':'' }}
</td> </td>
<th>图片尺寸</th> <th>图片尺寸</th>
<td class="blue"> <td class="blue">

45
src/views/task/modal/NewFilterModal.vue
Unescape View File

@ -319,6 +319,7 @@ defineExpose({
:rules="rules" :rules="rules"
require-mark-placement="left" require-mark-placement="left"
> >
<n-form-item path="name" label="标题"> <n-form-item path="name" label="标题">
<n-input <n-input
v-model:value="formValue.name" v-model:value="formValue.name"
@ -342,6 +343,7 @@ defineExpose({
:options="logicOptions" :options="logicOptions"
/> />
</n-form-item> </n-form-item>
<div class="sssscroll">
<n-form-item <n-form-item
v-for="(item, index) in formValue.conditions" v-for="(item, index) in formValue.conditions"
:key="index" :key="index"
@ -385,7 +387,7 @@ defineExpose({
<n-button <n-button
:style="noBorderInput" :style="noBorderInput"
icon-placement="right" icon-placement="right"
@click="removeCondition(index)" @click="index==0?()=>{}:removeCondition(index)"
style=" padding: 0; style=" padding: 0;
margin-left: 17px;" margin-left: 17px;"
> >
@ -393,7 +395,7 @@ defineExpose({
<!-- <SvgIcon size="24" name="close" color="#F00"/> <!-- <SvgIcon size="24" name="close" color="#F00"/>
--> -->
<svg <svg
:style="index==0?'cursor: not-allowed':''"
width="24px" width="24px"
height="24px" height="24px"
viewBox="0 0 64 64" viewBox="0 0 64 64"
@ -442,12 +444,14 @@ defineExpose({
</div> </div>
</template> </template>
</n-form-item> </n-form-item>
</n-form>
</div>
<div class="wrapper-new" @click="createCondition"> <div class="wrapper-new" @click="createCondition">
<SvgIcon size="16" name="addicon" style="margin-top: 3px;"/> <SvgIcon size="16" name="addicon" style="margin-top: 3px;"/>
<span style="margin-left: 8px">添加筛选条件</span> <span style="margin-left: 8px">添加筛选条件</span>
</div>
</div>
</n-form>
</div> </div>
</div> </div>
<div class="bottomline"></div> <div class="bottomline"></div>
<template #footer> <template #footer>
@ -544,6 +548,39 @@ defineExpose({
.modal_wrapper { .modal_wrapper {
padding: 14px 14px 0 14px !important; 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) { ::v-deep(.n-form-item .n-form-item-label) {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;

Write Preview
Loading…
Cancel
Save