[update] 修改一般检索页面样式,添加OA单点登录
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<a-spin :spinning="loading || selectOptionLoading">
|
||||
<a-card :bordered="false">
|
||||
<a-card :bordered="false" :bodyStyle="{height: cardHeight}">
|
||||
<!-- 搜索框部分 -->
|
||||
<div class="top-search-div">
|
||||
<div class="top-search-div-content">
|
||||
@@ -82,12 +82,12 @@
|
||||
<!-- 全文检索 -->
|
||||
<div v-html="item.content" class="result-content-wrapper"></div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div v-if="item.resourceType !== '4'" class="result-content-wrapper">
|
||||
{{ item.content }}
|
||||
</div>
|
||||
<div v-else v-html="item.content" class="result-content-wrapper"></div>
|
||||
</template>
|
||||
<!--<template v-else>-->
|
||||
<!-- <div v-if="item.resourceType !== '4'" class="result-content-wrapper">-->
|
||||
<!-- {{ item.content }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div v-else v-html="item.content" class="result-content-wrapper"></div>-->
|
||||
<!--</template>-->
|
||||
</div>
|
||||
</div>
|
||||
<a-pagination
|
||||
@@ -121,10 +121,17 @@ import {
|
||||
generalSearchFullTextSearch
|
||||
} from '@/api/dashboard'
|
||||
import { isHasPermission } from '@/utils/hasPermission'
|
||||
import { mapGetters } from 'vuex'
|
||||
|
||||
export default {
|
||||
name: 'GeneralSearch',
|
||||
components: { SearchHistoryModal },
|
||||
computed: {
|
||||
...mapGetters(['defaultHeight']),
|
||||
cardHeight () {
|
||||
return `calc(100vh - ${this.defaultHeight['user-info-height']} - ${this.defaultHeight['breadcrumb-height']}`
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
selectOptionLoading: false, // 其他筛选条件部分的loading
|
||||
@@ -467,7 +474,7 @@ export default {
|
||||
@import '~@assets/less/common.less';
|
||||
/deep/ .ant-card-body {
|
||||
padding: 0;
|
||||
height: calc(100vh - 45px - 59px - 12px);
|
||||
//height: calc(100vh - 45px - 59px - 12px);
|
||||
box-sizing: border-box;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
@@ -485,7 +492,7 @@ export default {
|
||||
// 头部搜索区域
|
||||
.top-search-div {
|
||||
width: 100%;
|
||||
min-height: 124px;
|
||||
min-height: 98px;
|
||||
background-image: url("../../../assets/image/searchPageBack.png");
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
@@ -514,12 +521,12 @@ export default {
|
||||
// 筛选区域
|
||||
.filter-area-div {
|
||||
padding: 10px 20px;
|
||||
box-sizing: border-box;
|
||||
//box-sizing: border-box;
|
||||
max-height: 300px;
|
||||
overflow-y: auto;
|
||||
.filter-row {
|
||||
height: auto;
|
||||
line-height: 44px;
|
||||
line-height: 38px;
|
||||
display: flex;
|
||||
}
|
||||
.label-col {
|
||||
@@ -536,8 +543,8 @@ export default {
|
||||
flex-wrap: wrap;
|
||||
.option-div {
|
||||
width: auto;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
height: 26px;
|
||||
line-height: 26px;
|
||||
padding: 0 12px;
|
||||
cursor: pointer;
|
||||
margin: 6px 4px;
|
||||
@@ -571,7 +578,7 @@ export default {
|
||||
.result-wrapper {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
padding: 24px;
|
||||
padding: 16px 24px 0;
|
||||
}
|
||||
|
||||
// 高亮样式
|
||||
@@ -592,6 +599,9 @@ export default {
|
||||
.result-title-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
p {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.result-title {
|
||||
color: #1D2129;
|
||||
font-size: 18px;
|
||||
@@ -634,11 +644,19 @@ export default {
|
||||
}
|
||||
}
|
||||
.result-content-wrapper {
|
||||
width: 100%;
|
||||
max-height: 40px;
|
||||
font-size: 14px;
|
||||
font-family: PingFang SC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #1D2129;
|
||||
line-height: 20px;
|
||||
margin-top: 10px;
|
||||
//display: -webkit-box; /* 将元素作为块级元素进行布局 */
|
||||
//-webkit-box-orient: vertical; /* 垂直方向对齐 */
|
||||
//-webkit-line-clamp: 2; /* 最多显示两行文本 */
|
||||
overflow: hidden; /* 控制溢出内容不被显示 */
|
||||
text-overflow: ellipsis; /* 当内容溢出时显示省略号 */
|
||||
.result-field-span {
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user