Commit 49841d11 authored by danfuman's avatar danfuman

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

# Conflicts:
#	dsk-operate-ui/src/views/projectCostLedger/detail/index.vue
parent ee71fe26
<template> <template>
<div class="detail-container"> <div class="detail-container">
直接费成本 直接费成本1
<div class="left"></div> <div class="left-menu"></div>
<div class="right"></div> <div class="right"></div>
</div> </div>
</template> </template>
......
<template> <template>
<div class="detail-container"> <div class="otherProjects-container">
其他项目11122 <div class="otherProjects-cont">
<div class="left"> <div class="left">
<el-menu <div class="left-menu">
default-active="2" <el-menu @open="handleOpen" @close="handleClose">
class="el-menu-vertical-demo" <el-submenu index="1">
@open="handleOpen" <template slot="title">
@close="handleClose"> <i class="el-icon-location"></i>
<el-submenu index="1"> <span>宝安中学(集团)初中部改扩建工程施工总承包-加固修缮工程</span>
<template slot="title"> </template>
<i class="el-icon-location"></i> <el-menu-item-group>
<span>宝安中学(集团)初中部改扩建工程施工总承包-加固修缮工程</span> <template slot="title">分组一</template>
</template> <el-menu-item index="1-1">选项1</el-menu-item>
<el-menu-item-group> <el-menu-item index="1-2">选项2</el-menu-item>
<template slot="title">分组一</template> </el-menu-item-group>
<el-menu-item index="1-1">选项1</el-menu-item> <el-menu-item-group title="分组2">
<el-menu-item index="1-2">选项2</el-menu-item> <el-menu-item index="1-3">选项3</el-menu-item>
</el-menu-item-group> </el-menu-item-group>
<el-menu-item-group title="分组2"> <el-submenu index="1-4">
<el-menu-item index="1-3">选项3</el-menu-item> <template slot="title">选项4</template>
</el-menu-item-group> <el-menu-item index="1-4-1">选项1</el-menu-item>
<el-submenu index="1-4"> </el-submenu>
<template slot="title">选项4</template> </el-submenu>
<el-menu-item index="1-4-1">选项1</el-menu-item> </el-menu>
</el-submenu> </div>
</el-submenu> </div>
</el-menu> <div class="right-table">
</div>
<div class="right">
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -79,14 +78,26 @@ export default { ...@@ -79,14 +78,26 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.detail-container { .otherProjects-container {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 0 24px; padding: 0 24px;
background: #ffffff; background: #ffffff;
height: 100%;
display: flex;
align-items: center;
.left{ .left{
width: 220px; width: 220px;
border-right: 1px solid #EEEEEE; height: 100%;
.left-menu{
width: 100%;
height: 100%;
border-right: 1px solid #eeeeee;
overflow: auto;
}
white-space: nowrap; /* 不换行 */
overflow: hidden; /* 超出部分隐藏 */
text-overflow: ellipsis; /* 显示省略号 */
} }
} }
</style> </style>
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