Merge branch 'zcwy_master' into zcwy-dev

# Conflicts:
#	src/views/project/ProjectDetails.vue
This commit is contained in:
joshen@zcwytd.com
2023-12-28 10:00:01 +08:00

View File

@@ -4,7 +4,7 @@
<div class="pdname"> <div class="pdname">
{{ data.name }} {{ data.name }}
<el-popover v-show="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" <el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300"
:content="data.remark"> :content="data.remark">
<template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template> <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
</el-popover> </el-popover>
@@ -757,7 +757,7 @@ function continueLearn(lastLearnedId) {
z-index: 9; z-index: 9;
} }
.el-popper { .el-popper {
z-index: 0 !important; // z-index: 0 !important;
} }
.pathdetails { .pathdetails {
.el-dialog__body{ .el-dialog__body{