Skip to content

E
exhibition_backstage
提交 6f564923 authored 作者: 龙菲's avatar 龙菲
浏览文件
操作

修复存留bug

上级 e9ae16df
隐藏空白字符变更
内嵌 并排
正在显示 包含 175 行增加 和 187 行删除
src/App.vue
浏览文件 @ 6f564923
......@@ -9,3 +9,9 @@ export default {
name: 'App'
}
</script>
<style lang="scss">
.el-image-viewer__wrapper{
z-index: 9999 !important;
}
</style>
src/components/Breadcrumb/index.vue
浏览文件 @ 6f564923
......@@ -20,6 +20,7 @@ export default {
},
watch: {
$route() {
this.getBreadcrumb()
}
},
......@@ -33,7 +34,7 @@ export default {
const first = matched[0]
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)
......
src/components/Footer/index.vue
浏览文件 @ 6f564923
......@@ -2,13 +2,6 @@
<template>
<div :class="{
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">
<img src="~@/assets/imgs/display/logo3.png" alt="" />
......@@ -19,11 +12,11 @@
<span slot="reference">网站地图</span>
<div class="map">
<div class="map-item" v-for="(item, index) in mapData" :key="index">
<div class="title" @click="handleClickItem(item)">
<div class="title">
{{ item.title }}
</div>
<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 }}
</li>
</ul>
......@@ -61,32 +54,6 @@
import { mapGetters } from "vuex";
export default {
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() {
return {
isHome: true,
......@@ -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>
......@@ -249,32 +205,4 @@ export default {
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>
src/components/NavBar/index.vue
浏览文件 @ 6f564923
......@@ -2,16 +2,6 @@
<div
:class="{
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"
>
......@@ -189,11 +179,10 @@ export default {
showThemeColor: false,
};
},
mounted() {
mounted(){
console.log(this.themeType);
},
methods: {
handleEnterTabItem(item) {
if (item.name == "展览展示") {
this.showSubMenu = true;
......@@ -260,21 +249,6 @@ export default {
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 {
height: $nav-height;
......
src/layout/components/Navbar.vue
浏览文件 @ 6f564923
......@@ -74,7 +74,7 @@
<el-button
type="primary"
@click.native="handleSubmitUserInfo"
icon="el-icon-circle-check"
:icon="isEditingUserInfo?'el-icon-circle-check':'el-icon-edit'"
>{{ isEditingUserInfo ? "保存" : "修改个人信息" }}</el-button
>
<el-button
......
src/utils/boutiqueTitles.js 0 → 100644
浏览文件 @ 6f564923
//此处为配置需跳转为精品展的展览
//在此处添加title后需在@/views/boutique/index.vue中引入对应的页面组件
export var titles = [
"神秘贵州",
"四渡赤水出奇兵",
"记忆与传承",
"夜郎的疑问",
"贵州教育史馆",
"梭戛博物馆陈列展览",
"中共贵州省工委旧址纪念馆"
];
src/views/display/components/PreviewDialog.vue
浏览文件 @ 6f564923
......@@ -12,7 +12,7 @@
<div class="label">{{ title }}</div>
</div>
<div class="dialog-content">
<Navbar/>
<NavBar/>
<NormalStyle
v-if="displayDetail.themeType == '1'"
:displayDetail="displayDetail"
......@@ -52,7 +52,6 @@ export default {
RedStyle,
NavBar,
Footer,
Navbar
},
props: {
visible: {
......@@ -100,6 +99,7 @@ export default {
};
</script>
<style lang='scss' scoped>
.title {
display: flex;
......
src/views/display/components/templates/RedStyle.vue
浏览文件 @ 6f564923
......@@ -615,7 +615,6 @@ $themeColor: #a30e0c;
background-size: 100%;
background-color: #651c14;
position: relative;
top: -$nav-height;
// height: 100%;
padding-bottom: 73px;
......
src/views/display/index.vue
浏览文件 @ 6f564923
......@@ -117,6 +117,7 @@ import { mapGetters } from "vuex";
import { themeTypeCode } from "./contants";
import { getToken } from "@/utils/auth";
import { importZip } from "@/utils/file";
import {titles} from '@/utils/boutiqueTitles'
export default {
components: {
TablePage,
......@@ -329,6 +330,10 @@ export default {
this.editDialogVisible = true;
case "view":
if (row) {
if (titles.includes(row.title)) {
this.$message.info('精品展暂不支持预览！')
return
}
this.previewDialogVisible = true;
let res = await getDisplayById({ exhibitionId: row.exhibitionId });
this.curPreviewObj = res.data;
......
src/views/displayApproval/components/PreviewDisplayDialog.vue
浏览文件 @ 6f564923
<template>
<el-dialog :visible.sync="dialogVisible" width="80%" :before-close="handleClose" top="5vh" lock-scroll>
<el-dialog
:visible.sync="dialogVisible"
width="80%"
:before-close="handleClose"
top="5vh"
lock-scroll
>
<div class="title" slot="title">
<div class="divider"></div>
<div class="label">{{ title }}</div>
......@@ -11,18 +17,36 @@
<BaseInfo :displayDetail="displayDetail" :dicts="dicts" />
</div>
</el-tab-pane> -->
<el-tab-pane label="效果预览" name="page">
<div class="container" v-if="dicts">
<NormalStyle v-if="displayDetail.themeType == '1'" :displayDetail="displayDetail" :dicts="dicts" />
<ChStyle v-if="displayDetail.themeType == '2'" :displayDetail="displayDetail" :dicts="dicts" />
<RedStyle v-if="displayDetail.themeType == '3'" :displayDetail="displayDetail" :dicts="dicts" />
<el-tab-pane label="效果预览" name="page" v-if="!isBoutique">
<div class="container" v-if="dicts && Object.keys(displayDetail).length>0">
<NavBar />
<NormalStyle
v-if="displayDetail.themeType == '1'"
:displayDetail="displayDetail"
:dicts="dicts"
/>
<ChStyle
v-if="displayDetail.themeType == '2'"
:displayDetail="displayDetail"
:dicts="dicts"
/>
<RedStyle
v-if="displayDetail.themeType == '3'"
:displayDetail="displayDetail"
:dicts="dicts"
/>
<Footer/>
</div>
</el-tab-pane>
<el-tab-pane label="审批历史记录" name="history">
<div class="container">
<el-steps :active="displayDetail.historyChecks.length">
<el-step v-for="(item, index) in displayDetail.historyChecks" :title="getStepTitle(item)" :key="index"
:icon="getStepIcon(item)">
<el-step
v-for="(item, index) in displayDetail.historyChecks"
:title="getStepTitle(item)"
:key="index"
:icon="getStepIcon(item)"
>
<div slot="description">
<div class="name">{{ item.createName }}</div>
<div class="time">{{ item.createTime }}</div>
......@@ -34,34 +58,63 @@
</el-tab-pane>
</el-tabs>
<div class="dialog-footer">
<span v-if="(displayDetail.checkStatus == 0)">
<el-button @click.native="handleCancel" style="margin-right:6px">取消</el-button>
<el-popover placement="top-end" width="400" trigger="manual" v-model="popoverVisible">
<span v-if="displayDetail.checkStatus == 0">
<el-button @click.native="handleCancel" style="margin-right: 6px"
>取消</el-button
>
<el-popover
placement="top-end"
width="400"
trigger="manual"
v-model="popoverVisible"
>
<div>
<el-form :model="dialogForm" prop="remark" :rules="rules" ref="form">
<el-form
:model="dialogForm"
prop="remark"
:rules="rules"
ref="form"
>
<el-form-item label="驳回意见" prop="remark">
<el-input type="textarea" placeholder="驳回意见" v-model="dialogForm.remark" size="small" :rows="4"
>
<el-input
type="textarea"
placeholder="驳回意见"
v-model="dialogForm.remark"
size="small"
:rows="4"
>
</el-input>
<el-button type="primary" style="float:right;margin-top:16px" @click.native="handleCheck(-2)"
size="small">确定</el-button>
<el-button
type="primary"
style="float: right; margin-top: 16px"
@click.native="handleCheck(-2)"
size="small"
>确定</el-button
>
</el-form-item>
</el-form>
</div>
<el-button slot="reference" type="danger" icon="el-icon-close"
@click.native="handleShowPopover">驳回</el-button>
<el-button
slot="reference"
type="danger"
icon="el-icon-close"
@click.native="handleShowPopover"
>驳回</el-button
>
</el-popover>
<el-button style="margin-left:6px" type="primary" icon="el-icon-check"
@click.native="handleCheck(1)">同意</el-button>
<el-button
style="margin-left: 6px"
type="primary"
icon="el-icon-check"
@click.native="handleCheck(1)"
>同意</el-button
>
</span>
<span v-else>
<el-button type="primary" @click.native="handleClose">关闭</el-button>
</span>
</div>
</div>
</el-dialog>
</template>
......@@ -70,16 +123,21 @@ import NormalStyle from "@/views/display/components/templates/NormalStyle.vue";
// import NormalStyle from "./components/NormalStyle.vue";
import ChStyle from "@/views/display/components/templates/ChStyle.vue";
import RedStyle from "@/views/display/components/templates/RedStyle.vue";
import BaseInfo from './BaseInfo'
import BaseInfo from "./BaseInfo";
import { mapGetters } from "vuex";
import { postCheck } from '@/api/display'
import { postCheck } from "@/api/display";
import NavBar from "@/components/NavBar";
import Footer from "@/components/Footer";
import { titles } from "@/utils/boutiqueTitles";
export default {
name: "PreviewDialog",
components: {
NormalStyle,
ChStyle,
RedStyle,
BaseInfo
BaseInfo,
NavBar,
Footer,
},
props: {
visible: {
......@@ -93,7 +151,7 @@ export default {
loading: {
type: Boolean,
default: false,
}
},
},
computed: {
......@@ -105,27 +163,32 @@ export default {
return (item) => {
switch (item.checkStatus) {
case 0:
return '发起审核'
return "发起审核";
case 1:
return '审核通过'
return "审核通过";
case -2:
return '驳回'
return "驳回";
}
}
};
},
getStepIcon(item) {
return (item) => {
switch (item.checkStatus) {
case 0:
return 'el-icon-s-promotion'
return "el-icon-s-promotion";
case 1:
return 'el-icon-s-claim'
return "el-icon-s-claim";
case -2:
return 'el-icon-circle-close'
return "el-icon-circle-close";
}
}
};
},
isBoutique() {
this.activeName = titles.includes(this.displayDetail.title)
? "history"
: "page";
return titles.includes(this.displayDetail.title);
},
},
watch: {
......@@ -137,16 +200,16 @@ export default {
deep: true,
},
loading(value) {
this.dialogLoading = value
}
this.dialogLoading = value;
},
},
data() {
return {
dialogVisible: false,
dialogForm: {
remark: '',//驳回意见
remark: "", //驳回意见
},
activeName: 'page',
activeName: "page",
historyChecks: [],
dialogLoading: false,
rules: {
......@@ -154,11 +217,11 @@ export default {
{
required: true,
message: "请输入驳回意见",
trigger: 'blur'
}
]
trigger: "blur",
},
],
},
popoverVisible: false
popoverVisible: false,
};
},
async mounted() {
......@@ -170,71 +233,74 @@ export default {
methods: {
handleClose(done) {
this.$emit("handleClose");
this.activeName = titles.includes(this.displayDetail.title)
? "history"
: "page";
},
async handleCheck(checkStatus) {
if (checkStatus == -2) {
this.$refs.form.validate(async valid => {
this.$refs.form.validate(async (valid) => {
if (valid) {
this.dialogLoading = true
this.dialogLoading = true;
const params = {
sourceId: this.displayDetail.exhibitionId,
checkStatus,
remark: this.dialogForm.remark,
sourceType: 'biz_exhibition',
sourceName: this.displayDetail.title
}
let res = await postCheck(params)
sourceType: "biz_exhibition",
sourceName: this.displayDetail.title,
};
let res = await postCheck(params);
if (res.code == 0) {
this.$message.success('操作成功！')
this.handleClose()
this.$emit('refresh')
this.$refs.form.resetFields()
this.$message.success("操作成功！");
this.handleClose();
this.$emit("refresh");
this.$refs.form.resetFields();
}
this.dialogLoading = false
this.popoverVisible = false
this.dialogLoading = false;
this.popoverVisible = false;
}
})
});
} else {
this.dialogLoading = true
this.dialogLoading = true;
const params = {
sourceId: this.displayDetail.exhibitionId,
checkStatus,
remark: this.dialogForm.remark,
sourceType: 'biz_exhibition',
sourceName: this.displayDetail.title
}
let res = await postCheck(params)
sourceType: "biz_exhibition",
sourceName: this.displayDetail.title,
};
let res = await postCheck(params);
if (res.code == 0) {
this.$message.success('操作成功！')
this.handleClose()
this.$emit('refresh')
this.$refs.form.resetFields()
this.$message.success("操作成功！");
this.handleClose();
this.$emit("refresh");
this.$refs.form.resetFields();
}
this.dialogLoading = false
this.popoverVisible = false
this.dialogLoading = false;
this.popoverVisible = false;
}
},
handleShowPopover() {
this.popoverVisible = true
this.popoverVisible = true;
},
handleCancel() {
this.handleClose()
this.$emit('refresh')
this.$refs.form.resetFields()
this.popoverVisible = false
this.dialogLoading = false
}
this.handleClose();
this.$emit("refresh");
this.$refs.form.resetFields();
this.popoverVisible = false;
this.dialogLoading = false;
},
},
};
</script>
<style lang='scss' scoped>
::v-deep .el-step.is-horizontal {
max-width: 300px !important;
}
.title {
display: flex;
margin-bottom: 16px;
......@@ -261,7 +327,6 @@ export default {
.desc {
color: #666 !important;
}
.name {
......@@ -283,7 +348,6 @@ export default {
font-weight: bold;
}
// ::v-deep .el-dialog__body {
// position: relative;
// }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论