明树Git Lab

Commit 378070bd authored by zhanghan's avatar zhanghan

1

parent 5f77fdec
Pipeline #111910 passed with stage
in 18 seconds
...@@ -1556,38 +1556,34 @@ const handleClose = () => { ...@@ -1556,38 +1556,34 @@ const handleClose = () => {
.header { .header {
width: 100%; width: 100%;
height: 80px; .vh(height, 80);
display: flex; display: flex;
justify-content: space-between; // 改为space-between,布局更均衡 justify-content: space-between;
align-items: center; align-items: center;
position: relative; position: relative;
padding: 0 20px; // 增加左右内边距,避免内容贴边 padding: 0 20px;
// 左侧导航按钮容器
.header-left { .header-left {
display: flex; display: flex;
gap: 10px; // 用gap替代margin-right,布局更可控
.nav-btn { .nav-btn {
margin-right: -32px; margin-right: -32px;
width: 194px; .vw(width, 194);
height: 54px; .vh(height, 54);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-family: YouSheBiaoTiYuan; font-family: YouSheBiaoTiYuan;
font-size: 20px; .font(20);
cursor: pointer; cursor: pointer;
background-image: url("@/assets/images/leftDefault.png"); // 默认背景图 background-image: url("@/assets/images/leftDefault.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 100% 100%; background-size: 100% 100%;
transition: all 0.2s ease; // 增加过渡动画
// 激活态样式
&.active { &.active {
font-size: 22px; .font(22);
background-image: url("@/assets/images/activeLeft.png"); // 激活背景图 background-image: url("@/assets/images/activeLeft.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -1595,17 +1591,17 @@ const handleClose = () => { ...@@ -1595,17 +1591,17 @@ const handleClose = () => {
} }
} }
// 中间标题容器(修正拼写错误:middile -> middle)
.header-middle { .header-middle {
flex: 1; // 占满剩余空间,让标题居中 flex: 1;
text-align: center; // 文字居中 text-align: center;
background-image: url("@/assets/images/header.png"); background-image: url("@/assets/images/header.png");
background-size: 100% 100%; background-size: 100% 100%;
height: 75px; .vh(height, 75);
.vh(font-size, 38);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 0 20px; // 增加左右间距 margin: 0 20px;
span { span {
background: linear-gradient(to bottom, #fff, #b4cff2); background: linear-gradient(to bottom, #fff, #b4cff2);
...@@ -1613,43 +1609,40 @@ const handleClose = () => { ...@@ -1613,43 +1609,40 @@ const handleClose = () => {
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
font-weight: 400; font-weight: 400;
font-family: "YouSheBiaoTiHei"; font-family: "YouSheBiaoTiHei";
font-size: 28px;
// 响应式适配 @media screen and (max-width: 2560px) {
.font(38);
}
@media screen and (max-width: 1920px) { @media screen and (max-width: 1920px) {
font-size: 24px; .font(28);
} }
@media screen and (max-width: 1440px) { @media screen and (max-width: 1440px) {
font-size: 20px; .font(24);
} }
} }
} }
// 右侧导航按钮容器
.header-right { .header-right {
display: flex; display: flex;
gap: 10px; // 用gap替代margin-left,布局更可控
.nav-btn { .nav-btn {
margin-left: -32px; margin-left: -32px;
width: 194px; .vw(width, 194);
height: 54px; .vh(height, 54);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-family: YouSheBiaoTiYuan; font-family: YouSheBiaoTiYuan;
font-size: 20px; .font(20);
cursor: pointer; cursor: pointer;
background-image: url("@/assets/images/rightDetault.png"); // 默认背景图 background-image: url("@/assets/images/rightDetault.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 100% 100%; background-size: 100% 100%;
transition: all 0.2s ease; // 增加过渡动画
// 激活态样式
&.active { &.active {
font-size: 22px; .font(22);
background-image: url("@/assets/images/activeRight.png"); // 激活背景图 background-image: url("@/assets/images/activeRight.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -1670,7 +1663,7 @@ const handleClose = () => { ...@@ -1670,7 +1663,7 @@ const handleClose = () => {
margin-right: 16px; margin-right: 16px;
color: white; color: white;
font-weight: 700; font-weight: 700;
font-size: 14px; .font(14);
display: flex; display: flex;
align-items: center; align-items: center;
gap: 6px; gap: 6px;
...@@ -1685,8 +1678,8 @@ const handleClose = () => { ...@@ -1685,8 +1678,8 @@ const handleClose = () => {
.vw(margin-top, 10); .vw(margin-top, 10);
span { span {
.font(14); .font(14);
width: 110px; .vw(width, 110);
height: 35px; .vw(height, 35);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -1747,26 +1740,26 @@ const handleClose = () => { ...@@ -1747,26 +1740,26 @@ const handleClose = () => {
background-image: url("@/assets/images/titleBgc.png"); background-image: url("@/assets/images/titleBgc.png");
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 36px; .vh(height, 36);
width: 102px; .vw(width, 102);
text-align: center; text-align: center;
line-height: 36px; .vh(line-height, 36);
font-weight: 600; font-weight: 600;
font-size: 18px; .font(18);
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
margin-bottom: 30px; .vh(margin-bottom, 30);
} }
display: flex; display: flex;
position: absolute; position: absolute;
left: 42vw; left: 42vw;
top: 50px; .vh(top, 50);
.info-right-wrap { .info-right-wrap {
.vw(right, 44); .vw(right, 44);
.vw(width, 580); .vw(width, 580);
display: flex; display: flex;
margin-right: 50px; .vw(margin-right, 50);
flex-direction: column; flex-direction: column;
z-index: 777; z-index: 777;
.info-title { .info-title {
...@@ -2005,7 +1998,7 @@ const handleClose = () => { ...@@ -2005,7 +1998,7 @@ const handleClose = () => {
.data-info { .data-info {
display: block !important; display: block !important;
.info-item { .info-item {
margin-bottom: 28px; .vh(margin-bottom, 28);
margin-right: 0; margin-right: 0;
} }
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
:validate-on-rule-change="false" :validate-on-rule-change="false"
label-width="200px" label-width="180px"
:disabled="isPreview || Number(formData.projectLzType) >= 5" :disabled="isPreview || Number(formData.projectLzType) >= 5"
> >
<el-collapse v-model="activeCollapse"> <el-collapse v-model="activeCollapse">
...@@ -322,45 +322,27 @@ ...@@ -322,45 +322,27 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-row :gutter="20"> <div class="col-title">投资指南分类</div>
<el-col :span="12">
<div class="col-title">投资指南分类</div>
<el-form-item label="2+9布局分类" prop="bjfl"> <el-form-item label="2+9布局分类" prop="bjfl">
<CommonSelector <CommonSelector
v-model="formData.bjfl" v-model="formData.bjfl"
dictName="layoutType" dictName="layoutType"
@change="changeJcTzznyjfl" @change="changeJcTzznyjfl"
/> />
</el-form-item> </el-form-item>
<el-form-item label="国民经济行业" prop="gmjjhy"> <el-form-item label="国民经济行业" prop="gmjjhy">
<el-tree-select <el-tree-select
v-model="formData.gmjjhy" v-model="formData.gmjjhy"
:data="gmjjhyList" :data="gmjjhyList"
node-key="id" node-key="id"
:props="gmjjhyProps" :props="gmjjhyProps"
placeholder="请选择" placeholder="请选择"
render-after-expand render-after-expand
clearable clearable
/> />
</el-form-item> </el-form-item>
</el-col>
<!-- <el-col :span="12">
<div class="col-title"></div>
<el-form-item label="国民经济行业">
<el-tree-select
v-model="formData.gmjjhy"
:data="gmjjhyList"
node-key="id"
:props="gmjjhyProps"
placeholder="请选择"
render-after-expand
clearable
/>
</el-form-item>
</el-col> -->
</el-row>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment