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

fix:样式修改 #349

Merged
yaoshuli merged 1 commits from fix/change_task into test 1 year ago
Conversation 0 Commits 1 Files Changed 19
19 changed files with 45 additions and 65 deletions
Show Stats Download Patch File Download Diff File

8
src/components/Search/Search.vue
Unescape View File

@ -118,9 +118,9 @@ onMounted(() => {
> >
<template #prefix> <template #prefix>
<SvgIcon <SvgIcon
name="magnifying-1" name="magnifying-1-color999"
width="21" width="16"
height="20" height="16"
style="margin: 10px 0 10px 4px" style="margin: 10px 0 10px 4px"
/> />
</template> </template>
@ -179,6 +179,7 @@ onMounted(() => {
<style lang="less" scoped> <style lang="less" scoped>
.input_wrap { .input_wrap {
// width: 60%; // width: 60%;
width: 808px; width: 808px;
position: absolute; position: absolute;
@ -292,4 +293,5 @@ onMounted(() => {
.highlight { .highlight {
color: #507afd; color: #507afd;
} }
</style> </style>

2
src/layout/components/Header/ShortcutModal.vue
Unescape View File

@ -121,7 +121,7 @@ defineExpose({
</div> </div>
<n-divider style="margin: 24px 24px 32px 24px; color: #d9d9d9" /> <n-divider style="margin: 24px 24px 32px 24px; color: #d9d9d9" />
<div class="title" style="margin-top: -16.5px"> <div class="title" style="margin-top: -16.5px">
任务审批/任务终审/AI工单明细动作 图检审批/任务审批/任务终审明细动作
</div> </div>
<div class="wrapper-request"> <div class="wrapper-request">
<table style="margin-left: 73px; width: 290px"> <table style="margin-left: 73px; width: 290px">

9
src/layout/components/Header/index.vue
Unescape View File

@ -66,7 +66,7 @@ export default defineComponent({
// 图标列表mm // 图标列表mm
const iconList = ref([ const iconList = ref([
{ {
icon: 'magnifying-1', icon: 'magnifying-1-color999',
handle: searchHandler, handle: searchHandler,
}, },
{ {
@ -342,12 +342,17 @@ height: 36px;" @click="closeModal">
<RecycleModal ref="recycleModalRef" /> <RecycleModal ref="recycleModalRef" />
<QuillModal ref="quillModalRef" /> <QuillModal ref="quillModalRef" />
<ShortcutModal ref="shortcutModal" /> <ShortcutModal ref="shortcutModal" />
<SearchModal ref="SearchModalRef" /> <div class="ssss"><SearchModal ref="SearchModalRef" /></div>
<TishiDialog ref="tishiModalRef" :label="'您确定要退出登录吗'" @tishiok="tishiok"/> <TishiDialog ref="tishiModalRef" :label="'您确定要退出登录吗'" @tishiok="tishiok"/>
</template> </template>
<style lang="less" scoped> <style lang="less" scoped>
.ssss{
::v-deep .n-modal-mask{
background-color:transparent !important;
}
}
.layout-header { .layout-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

6
src/views/final/comp/CustomFilterModalVue.vue
Unescape View File

@ -413,7 +413,7 @@ onMounted(() => {
<div class="input_wrap"> <div class="input_wrap">
<n-input placeholder="搜索关键词" @input="leftInputHandler"> <n-input placeholder="搜索关键词" @input="leftInputHandler">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1-color999" /> <SvgIcon size="16" name="magnifying-1-color999-color999" />
</template> </template>
</n-input> </n-input>
<n-scrollbar <n-scrollbar
@ -464,7 +464,7 @@ onMounted(() => {
<div class="input_wrap"> <div class="input_wrap">
<n-input placeholder="搜索关键词" @input="rightInputHandler"> <n-input placeholder="搜索关键词" @input="rightInputHandler">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1-color999" /> <SvgIcon size="16" name="magnifying-1-color999-color999" />
</template> </template>
</n-input> </n-input>
<n-scrollbar <n-scrollbar
@ -484,7 +484,7 @@ onMounted(() => {
:draggable="true" :draggable="true"
class="cursor-move draggable-li" class="cursor-move draggable-li"
> >
<SvgIcon name="drag" size="24" /> <SvgIcon name="drag" size="14" />
<span class="ml-2">{{ item.name }}</span> <span class="ml-2">{{ item.name }}</span>
<SvgIcon <SvgIcon
v-if="!item.fix" v-if="!item.fix"

6
src/views/final/comp/CustomTabelModal.vue
Unescape View File

@ -328,7 +328,7 @@ const indeterminate = computed(() => {
<div class="left"> <div class="left">
<n-input placeholder="搜索关键字"> <n-input placeholder="搜索关键字">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" color="#999999" /> <SvgIcon size="16" name="magnifying-1-color999" color="#999999" />
</template> </template>
</n-input> </n-input>
<div class="draggable-ul left-wrap"> <div class="draggable-ul left-wrap">
@ -374,7 +374,7 @@ const indeterminate = computed(() => {
<div style="height:477px; border: 1px solid #cad2dd !important;; overflow:auto"> <div style="height:477px; border: 1px solid #cad2dd !important;; overflow:auto">
<n-input placeholder="搜索关键字"> <n-input placeholder="搜索关键字">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<div class="drag-wrapper"> <div class="drag-wrapper">
@ -452,7 +452,7 @@ const indeterminate = computed(() => {
<n-button style="background-color: #507afd;width: 72px;height: 38px;" type="info" @click="handleSumbit"> <n-button style="background-color: #507afd;width: 72px;height: 38px;" type="info" @click="handleSumbit">
确定 确定
</n-button> </n-button>
<n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;" @click="closeModal"> <n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;background:#ffffff" @click="closeModal">
取消 取消
</n-button> </n-button>
</div> </div>

2
src/views/final/comp/FilterModal.vue
Unescape View File

@ -392,7 +392,7 @@ function handleOk() {
@input="inputHandler" @input="inputHandler"
> >
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<NButton type="info" @click="handleClick"> <NButton type="info" @click="handleClick">

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

@ -67,17 +67,8 @@ const rules: FormRules = {
trigger: 'blur', trigger: 'blur',
}, },
conditions: { conditions: {
required: true, // required: true,
validator(rule: FormItemRule, value: Condition[]) {
for (const item of value) {
const { type, operator, result } = item
if (type === null || operator === null || result === null)
return new Error('请选择过滤条件')
}
return true
},
trigger: ['input', 'blur'],
}, },
} }

2
src/views/final/content/ListContent.vue
Unescape View File

@ -699,7 +699,7 @@ defineExpose({
<div class="checking">—</div>全选 <div class="checking">—</div>全选
</div> </div>
<div style="width: 3vw"> <div style="width: 3vw">
<!-- <SvgIcon name="magnifying-1" size="18" style="margin-right: 8px" /> <!-- <SvgIcon name="magnifying-1-color999" size="18" style="margin-right: 8px" />
<SvgIcon <SvgIcon
style="cursor: pointer" style="cursor: pointer"
size="18" size="18"

6
src/views/home/aside/comp/AdvanceFilter.vue
Unescape View File

@ -344,7 +344,7 @@ defineExpose({
@input="inputHandler" @input="inputHandler"
> >
<template #prefix> <template #prefix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
<template #suffix> <template #suffix>
<SvgIcon <SvgIcon
@ -450,8 +450,8 @@ defineExpose({
<div class="wrapper-right"> <div class="wrapper-right">
<SvgIcon <SvgIcon
style="display: block; cursor: pointer" style="display: block; cursor: pointer"
size="18" size="16"
name="magnifying-1" name="magnifying-1-color999"
@click="emit('update:search')" @click="emit('update:search')"
/> />

4
src/views/home/aside/comp/Search.vue
Unescape View File

@ -117,8 +117,8 @@ onMounted(() => {
> >
<template #suffix> <template #suffix>
<SvgIcon <SvgIcon
size="14px" size="16"
name="magnifying-1" name="magnifying-1-color999"
style="cursor: pointer" style="cursor: pointer"
@click="searchName" @click="searchName"
/> />

4
src/views/home/aside/comp/modals/CustomFilterModal.vue
Unescape View File

@ -370,7 +370,7 @@ onMounted(() => {
<div class="input_wrap"> <div class="input_wrap">
<n-input placeholder="搜索关键词" @input="leftInputHandler"> <n-input placeholder="搜索关键词" @input="leftInputHandler">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1-color999" /> <SvgIcon size="16" name="magnifying-1-color999-color999" />
</template> </template>
</n-input> </n-input>
<n-scrollbar <n-scrollbar
@ -421,7 +421,7 @@ onMounted(() => {
<div class="input_wrap"> <div class="input_wrap">
<n-input placeholder="搜索关键词" @input="rightInputHandler"> <n-input placeholder="搜索关键词" @input="rightInputHandler">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1-color999" /> <SvgIcon size="16" name="magnifying-1-color999-color999" />
</template> </template>
</n-input> </n-input>
<n-scrollbar <n-scrollbar

2
src/views/home/aside/comp/modals/FilterModal.vue
Unescape View File

@ -432,7 +432,7 @@ function handleOk() {
@input="inputHandler" @input="inputHandler"
> >
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<n-button type="info" @click="handleClick"> <n-button type="info" @click="handleClick">

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

@ -69,17 +69,7 @@ const rules: FormRules = {
trigger: 'blur', trigger: 'blur',
}, },
conditions: { conditions: {
required: true,
validator(rule: FormItemRule, value: Condition[]) {
for (const item of value) {
const { type, operator, result } = item
if (type === null || operator === null || result === null)
return new Error('请选择过滤条件')
}
return true
},
trigger: ['input', 'blur'],
}, },
} }

4
src/views/message/content/List.vue
Unescape View File

@ -231,7 +231,9 @@ console.log(tabList)
box-sizing: border-box; box-sizing: border-box;
background: #fff; background: #fff;
border-radius: 3px; border-radius: 3px;
height: calc(100vh - 88px); height: calc(100vh - 80px);
margin-left: 16px;
margin-right: 16px;
position: relative; position: relative;
.header { .header {

4
src/views/task/aside/Aside.vue
Unescape View File

@ -261,7 +261,7 @@ function handleOk(item: any) {
<SvgIcon <SvgIcon
style="cursor: pointer; margin-left: 10px" style="cursor: pointer; margin-left: 10px"
size="18" size="18"
name="magnifying-1" name="magnifying-1-color999"
@click="setShowSearch(true)" @click="setShowSearch(true)"
/> />
<SvgIcon <SvgIcon
@ -294,7 +294,7 @@ function handleOk(item: any) {
@input="inputHandler" @input="inputHandler"
> >
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<SvgIcon <SvgIcon

4
src/views/task/modal/CustomFieldModal.vue
Unescape View File

@ -383,7 +383,7 @@ const moreThanSix = computed(() => {
@input="(value) => queryData(value, 'off')" @input="(value) => queryData(value, 'off')"
> >
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<div class="draggable-ul"> <div class="draggable-ul">
@ -432,7 +432,7 @@ const moreThanSix = computed(() => {
@input="(value) => queryData(value, 'on')" @input="(value) => queryData(value, 'on')"
> >
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<div class="draggable-title"> <div class="draggable-title">

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

@ -66,17 +66,7 @@ const rules: FormRules = {
trigger: 'blur', trigger: 'blur',
}, },
conditions: { conditions: {
required: true,
validator(rule: FormItemRule, value: Condition[]) {
for (const item of value) {
const { type, operator, result } = item
if (type === null || operator === null || result === null)
return new Error('请选择过滤条件')
}
return true
},
trigger: ['input', 'blur'],
}, },
} }

6
src/views/worksheet/aside/Aside.vue
Unescape View File

@ -209,8 +209,8 @@ if (searchContent) {
<div class="right"> <div class="right">
<SvgIcon <SvgIcon
style="cursor: pointer; margin-left: 10px" style="cursor: pointer; margin-left: 10px"
size="18" size="16"
name="magnifying-1" name="magnifying-1-color999"
@click="setShowSearch(true)" @click="setShowSearch(true)"
/> />
@ -231,7 +231,7 @@ if (searchContent) {
@input="inputHandler" @input="inputHandler"
> >
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<SvgIcon <SvgIcon

4
src/views/worksheet/modal/CustomFieldModal.vue
Unescape View File

@ -353,7 +353,7 @@ const indeterminate = computed(() => {
<div class="left"> <div class="left">
<n-input v-model:value="searchKey" placeholder="搜索关键词"> <n-input v-model:value="searchKey" placeholder="搜索关键词">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<div class="draggable-ul"> <div class="draggable-ul">
@ -400,7 +400,7 @@ const indeterminate = computed(() => {
<div class="overstyle"> <div class="overstyle">
<n-input v-model:value="searchFixVal" placeholder="搜索关键词"> <n-input v-model:value="searchFixVal" placeholder="搜索关键词">
<template #suffix> <template #suffix>
<SvgIcon size="14px" name="magnifying-1" /> <SvgIcon size="16" name="magnifying-1-color999" />
</template> </template>
</n-input> </n-input>
<div class="titletwo">系统默认</div> <div class="titletwo">系统默认</div>

Write Preview
Loading…
Cancel
Save