Skip to content

E
exhibition_page
提交 3190a517 authored 作者: 龙菲's avatar 龙菲
浏览文件
操作

修复列表页标题错乱、搜索栏适配；修改3D文物筛选样式

上级 7bdde13f
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 31 行删除
package-lock.json
浏览文件 @ 3190a517
差异被折叠。
src/icons/svg/filter-s.svg 0 → 100644
浏览文件 @ 3190a517
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1662474734184" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3073" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M971.614323 53.05548L655.77935 412.054233C635.196622 435.434613 623.906096 465.509377 623.906096 496.583302v495.384307c0 28.975686-35.570152 43.063864-55.353551 21.781723l-159.865852-171.256294c-5.495389-5.895053-8.59279-13.688514-8.592789-21.781722V496.583302c0-31.073925-11.290526-61.148688-31.873254-84.429153L52.385677 53.05548C34.200936 32.472751 48.888611 0 76.365554 0h871.268892c27.476943 0 42.164618 32.472751 23.979877 53.05548z" p-id="3074"></path></svg>
\ No newline at end of file
src/icons/svg/filter.svg 0 → 100644
浏览文件 @ 3190a517
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1662474726402" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2934" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M865.253402 77.246076L607.733171 369.941752C576.954657 404.917337 559.966516 449.985876 559.966516 496.653298v414.31078L466.23195 810.434255c-1.399023-1.498954-2.198465-3.397628-2.198466-5.496163V496.653298c0-46.667423-16.988141-91.735961-47.766655-126.711546L158.746598 77.246076c-4.496861-5.196373-0.899372-13.290722 5.995814-13.290722h694.515176c6.895187 0 10.592606 8.09435 5.995814 13.290722zM52.320891 53.062958l315.879492 359.049356c20.58563 23.383676 31.877747 53.362749 31.877747 84.441054v324.173702c0 8.09435 3.097837 15.888908 8.594001 21.784793l159.888385 171.280433c19.786188 21.185211 55.361354 7.194977 55.361354-21.784793V496.653298c0-31.078305 11.292117-61.157308 31.877747-84.441054L971.679109 53.062958C989.866413 32.477328 975.176667 0 947.695851 0H76.304149C48.823333 0 34.133587 32.477328 52.320891 53.062958z" p-id="2935"></path></svg>
\ No newline at end of file
src/views/culturalRelic/index.vue
浏览文件 @ 3190a517
<template> <template>
<div class="cultural-relic"> <div class="cultural-relic">
<ListBanner title="虚拟展厅" /> <ListBanner title="精选文物" />
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="search wow animate__animated animate__fadeIn"> <div class="search wow animate__animated animate__fadeIn">
<el-row <el-row
style="width: 100%; display: flex; align-items: center" style="width: 100%; display: flex; align-items: center"
:span="4" :span="2"
> >
<el-col :span="6"> <el-col :span="6">
<el-input <el-input
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
placeholder="关键词" placeholder="关键词"
@keyup.enter.native="search" @keyup.enter.native="search"
clearable clearable
style="width: 100%"
> >
</el-input> </el-input>
</el-col> </el-col>
...@@ -28,7 +27,6 @@ ...@@ -28,7 +27,6 @@
filterable filterable
@change="handleTypeChange" @change="handleTypeChange"
clearable clearable
style="width: 100%"
> >
<el-option <el-option
v-for="(value, key) in dicts.culturalRelicType" v-for="(value, key) in dicts.culturalRelicType"
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
@change="handleYearsChange" @change="handleYearsChange"
clearable clearable
ref="years" ref="years"
style="width: 100%"
> >
</el-cascader> </el-cascader>
</el-col> </el-col>
...@@ -61,13 +58,16 @@ ...@@ -61,13 +58,16 @@
</div> </div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3" class="threeD" @click.native="handleClickThreeD">
<div class="threeD" @click="handleClickThreeD"> <!-- <div class="threeD" @click="handleClickThreeD">
<div class="box"> <div class="box">
<i class="el-icon-check" v-show="onlyShow3d"></i> <i class="el-icon-check" v-show="onlyShow3d"></i>
</div> </div>
<div class="text">查看3D文物</div> </div> -->
</div> <svg-icon
:icon-class="onlyShow3d ? 'filter-s' : 'filter'"
></svg-icon>
<div class="text">3D</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -349,24 +349,42 @@ $text-indent: 16px; ...@@ -349,24 +349,42 @@ $text-indent: 16px;
.threeD { .threeD {
display: flex; display: flex;
cursor: pointer; cursor: pointer;
.box { font-size: 18px;
width: 28px; color: #666;
height: 28px; margin-left: 20px;
display: flex; transition: all ease .5s;
justify-content: center; .svg-icon{
align-items: center; margin-right: 4px;
border: 2px solid #444; font-size: 20px;
margin-right: 6px;
i {
font-size: 28px;
}
}
.text {
display: flex;
justify-content: center;
align-items: center;
color: #444;
} }
&:hover{
text-shadow: 0 0 5px #fff,
0 0 10px #fff,
0 0 15px #fff,
0 0 20px #2069c4,
0 0 35px #2069c4,
0 0 40px #2069c4,
0 0 50px #2069c4,
0 0 75px #2069c4;
}
// .box {
// width: 28px;
// height: 28px;
// display: flex;
// justify-content: center;
// align-items: center;
// border: 2px solid #444;
// margin-right: 6px;
// i {
// font-size: 28px;
// }
// }
// .text {
// display: flex;
// justify-content: center;
// align-items: center;
// color: #444;
// }
} }
.search-button { .search-button {
cursor: pointer; cursor: pointer;
...@@ -571,6 +589,11 @@ $text-indent: 16px; ...@@ -571,6 +589,11 @@ $text-indent: 16px;
} }
} }
} }
::v-deep .el-input {
width: auto !important;
}
::v-deep .el-pagination { ::v-deep .el-pagination {
.btn-prev, .btn-prev,
.btn-next { .btn-next {
......
src/views/display/index.vue
浏览文件 @ 3190a517
...@@ -479,9 +479,9 @@ $text-indent: 16px; ...@@ -479,9 +479,9 @@ $text-indent: 16px;
font-weight: bold; font-weight: bold;
} }
::v-deep .el-input, ::v-deep .el-input,
.el-cascader { .el-cascader {
width: 368px !important;
.el-input__inner { .el-input__inner {
width: 100%; width: 100%;
border: none; border: none;
...@@ -501,6 +501,10 @@ $text-indent: 16px; ...@@ -501,6 +501,10 @@ $text-indent: 16px;
background: transparent; background: transparent;
} }
} }
::v-deep .el-input {
width: auto !important;;
}
::v-deep .el-pager { ::v-deep .el-pager {
li { li {
width: 28px; width: 28px;
......
src/views/museum/index.vue
浏览文件 @ 3190a517
<template> <template>
<div class="display"> <div class="display">
<!-- <NavBar /> --> <!-- <NavBar /> -->
<ListBanner title="精选展览" /> <ListBanner title="博物馆" />
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div class="search wow animate__animated animate__fadeIn"> <div class="search wow animate__animated animate__fadeIn">
......
src/views/virtual/index.vue
浏览文件 @ 3190a517
...@@ -311,6 +311,10 @@ $text-indent: 16px; ...@@ -311,6 +311,10 @@ $text-indent: 16px;
margin-right: 4px; margin-right: 4px;
} }
} }
::v-deep .el-input{
width: auto;
}
} }
.content { .content {
width: 100%; width: 100%;
...@@ -446,6 +450,10 @@ $text-indent: 16px; ...@@ -446,6 +450,10 @@ $text-indent: 16px;
} }
} }
} }
::v-deep .el-input{
// width: auto;
}
::v-deep .el-pagination { ::v-deep .el-pagination {
.btn-prev, .btn-prev,
.btn-next { .btn-next {
......
vue.config.js
浏览文件 @ 3190a517
...@@ -49,15 +49,16 @@ module.exports = defineConfig({ ...@@ -49,15 +49,16 @@ module.exports = defineConfig({
proxy: { proxy: {
'/api': { '/api': {
// target: 'http://192.168.1.230:9562/api', // target: 'http://192.168.1.230:9562/api',
// target: 'http://222.85.214.245:9062/api', target: 'http://222.85.214.245:9566/api',
target:'http://192.168.1.230:9566/api', // target:'http://192.168.1.230:9566/api',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '' '^/api': ''
} }
}, },
'/files':{ '/files':{
target:'http://192.168.1.230:9563/files', // target:'http://192.168.1.230:9563/files',
target: 'http://222.85.214.245:9563/files',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/files': '' '^/files': ''
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论