提交 6f564923 authored 作者: 龙菲's avatar 龙菲

修复存留bug

上级 e9ae16df
...@@ -9,3 +9,9 @@ export default { ...@@ -9,3 +9,9 @@ export default {
name: 'App' name: 'App'
} }
</script> </script>
<style lang="scss">
.el-image-viewer__wrapper{
z-index: 9999 !important;
}
</style>
...@@ -20,6 +20,7 @@ export default { ...@@ -20,6 +20,7 @@ export default {
}, },
watch: { watch: {
$route() { $route() {
this.getBreadcrumb() this.getBreadcrumb()
} }
}, },
...@@ -33,7 +34,7 @@ export default { ...@@ -33,7 +34,7 @@ export default {
const first = matched[0] const first = matched[0]
if (!this.isDashboard(first)) { if (!this.isDashboard(first)) {
matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched) matched = [{ path: '/home', meta: { title: '首页' }}].concat(matched)
} }
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
......
...@@ -2,13 +2,6 @@ ...@@ -2,13 +2,6 @@
<template> <template>
<div :class="{ <div :class="{
footer: true, footer: true,
//isHome:isHome,
isChStyle: navbarStyle == '2',
isRedStyle: navbarStyle == '3',
isSDCS: navbarStyle == '4',
isSMGZ: navbarStyle == '5',
isJYYCC: navbarStyle == '6',
isYLGDYW: navbarStyle == '7',
}"> }">
<div class="logo"> <div class="logo">
<img src="~@/assets/imgs/display/logo3.png" alt="" /> <img src="~@/assets/imgs/display/logo3.png" alt="" />
...@@ -19,11 +12,11 @@ ...@@ -19,11 +12,11 @@
<span slot="reference">网站地图</span> <span slot="reference">网站地图</span>
<div class="map"> <div class="map">
<div class="map-item" v-for="(item, index) in mapData" :key="index"> <div class="map-item" v-for="(item, index) in mapData" :key="index">
<div class="title" @click="handleClickItem(item)"> <div class="title">
{{ item.title }} {{ item.title }}
</div> </div>
<ul v-if="item.children && item.children.length > 0"> <ul v-if="item.children && item.children.length > 0">
<li v-for="(v, i) in item.children" :key="i" @click="handleClickItem(v)"> <li v-for="(v, i) in item.children" :key="i">
{{ v.title }} {{ v.title }}
</li> </li>
</ul> </ul>
...@@ -61,32 +54,6 @@ ...@@ -61,32 +54,6 @@
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
name: "Footer", name: "Footer",
computed: {
...mapGetters(["curPath", "navbarStyle"]),
},
watch: {
curPath: {
handler: function (value) {
this.isHome = value.name == "home";
if (value.params.themeType) {
this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType);
} else {
this.$store.commit("app/CHANGE_NAV_COLOR", "1");
}
},
immediate: true,
},
},
// curPath: {
// handler: function (value) {
// if (value.params.themeType) {
// this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType);
// } else {
// this.$store.commit("app/CHANGE_NAV_COLOR", "1");
// }
// },
// immediate: true,
// },
data() { data() {
return { return {
isHome: true, isHome: true,
...@@ -139,17 +106,6 @@ export default { ...@@ -139,17 +106,6 @@ export default {
], ],
}; };
}, },
methods: {
handleClickItem(item) {
// console.log(item);
if (item.path) {
const newPage = this.$router.resolve({
path: item.path,
});
window.open(newPage.href, "_blank");
}
},
},
}; };
</script> </script>
...@@ -249,32 +205,4 @@ export default { ...@@ -249,32 +205,4 @@ export default {
object-fit: contain; object-fit: contain;
} }
} }
.isChStyle {
background-color: #194448 !important;
position: relative;
top: -$nav-height;
}
.isRedStyle {
background-color: #813525 !important;
position: relative;
top: -$nav-height;
}
.isSDCS {
background-color: #6c0c0d !important;
}
.isSMGZ {
background-color: #00173a !important;
}
.isJYYCC {
background-color: #343b66 !important;
}
.isYLGDYW {
background-color: #212040 !important;
}
</style> </style>
...@@ -2,16 +2,6 @@ ...@@ -2,16 +2,6 @@
<div <div
:class="{ :class="{
nav: true, nav: true,
'header-absolute': isAbsolute,
'header-fixed ': isFixed,
// 'header-absolute': isHome || isBoutique,
'show-themeColor': showThemeColor,
isChStyle: navbarStyle == '2',
isRedStyle: navbarStyle == '3',
isSDCS: navbarStyle == '4' && isFixed,
isSMGZ: navbarStyle == '5' && isFixed,
isJYYCC: navbarStyle == '6' && isFixed,
isYLGDYW: navbarStyle == '7' && isFixed,
}" }"
id="navbar" id="navbar"
> >
...@@ -189,11 +179,10 @@ export default { ...@@ -189,11 +179,10 @@ export default {
showThemeColor: false, showThemeColor: false,
}; };
}, },
mounted() { mounted(){
console.log(this.themeType);
}, },
methods: { methods: {
handleEnterTabItem(item) { handleEnterTabItem(item) {
if (item.name == "展览展示") { if (item.name == "展览展示") {
this.showSubMenu = true; this.showSubMenu = true;
...@@ -260,21 +249,6 @@ export default { ...@@ -260,21 +249,6 @@ export default {
background-color: rgba(0, 0, 0, 0.25) !important; background-color: rgba(0, 0, 0, 0.25) !important;
} }
.isSDCS {
background-color: #6c0c0d !important;
}
.isSMGZ {
background-color: #00173a !important;
}
.isJYYCC {
background-color: #343b66 !important;
}
.isYLGDYW {
background-color: #212040 !important;
}
.nav { .nav {
height: $nav-height; height: $nav-height;
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<el-button <el-button
type="primary" type="primary"
@click.native="handleSubmitUserInfo" @click.native="handleSubmitUserInfo"
icon="el-icon-circle-check" :icon="isEditingUserInfo?'el-icon-circle-check':'el-icon-edit'"
>{{ isEditingUserInfo ? "保存" : "修改个人信息" }}</el-button >{{ isEditingUserInfo ? "保存" : "修改个人信息" }}</el-button
> >
<el-button <el-button
......
//此处为配置需跳转为精品展的展览
//在此处添加title后需在@/views/boutique/index.vue中引入对应的页面组件
export var titles = [
"神秘贵州",
"四渡赤水出奇兵",
"记忆与传承",
"夜郎的疑问",
"贵州教育史馆",
"梭戛博物馆陈列展览",
"中共贵州省工委旧址纪念馆"
];
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="label">{{ title }}</div> <div class="label">{{ title }}</div>
</div> </div>
<div class="dialog-content"> <div class="dialog-content">
<Navbar/> <NavBar/>
<NormalStyle <NormalStyle
v-if="displayDetail.themeType == '1'" v-if="displayDetail.themeType == '1'"
:displayDetail="displayDetail" :displayDetail="displayDetail"
...@@ -52,7 +52,6 @@ export default { ...@@ -52,7 +52,6 @@ export default {
RedStyle, RedStyle,
NavBar, NavBar,
Footer, Footer,
Navbar
}, },
props: { props: {
visible: { visible: {
...@@ -100,6 +99,7 @@ export default { ...@@ -100,6 +99,7 @@ export default {
}; };
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
.title { .title {
display: flex; display: flex;
......
...@@ -615,7 +615,6 @@ $themeColor: #a30e0c; ...@@ -615,7 +615,6 @@ $themeColor: #a30e0c;
background-size: 100%; background-size: 100%;
background-color: #651c14; background-color: #651c14;
position: relative; position: relative;
top: -$nav-height;
// height: 100%; // height: 100%;
padding-bottom: 73px; padding-bottom: 73px;
......
...@@ -117,6 +117,7 @@ import { mapGetters } from "vuex"; ...@@ -117,6 +117,7 @@ import { mapGetters } from "vuex";
import { themeTypeCode } from "./contants"; import { themeTypeCode } from "./contants";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { importZip } from "@/utils/file"; import { importZip } from "@/utils/file";
import {titles} from '@/utils/boutiqueTitles'
export default { export default {
components: { components: {
TablePage, TablePage,
...@@ -329,6 +330,10 @@ export default { ...@@ -329,6 +330,10 @@ export default {
this.editDialogVisible = true; this.editDialogVisible = true;
case "view": case "view":
if (row) { if (row) {
if (titles.includes(row.title)) {
this.$message.info('精品展暂不支持预览!')
return
}
this.previewDialogVisible = true; this.previewDialogVisible = true;
let res = await getDisplayById({ exhibitionId: row.exhibitionId }); let res = await getDisplayById({ exhibitionId: row.exhibitionId });
this.curPreviewObj = res.data; this.curPreviewObj = res.data;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论