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

dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue

 <template>
   <div class="detail-container">
-    直接费成本
-    <div class="left"></div>
+    直接费成本1
+    <div class="left-menu"></div>
     <div class="right"></div>
   </div>
 </template>

dsk-operate-ui/src/views/projectCostLedger/detail/components/OtherProjects/index.vue

 <template>
-  <div class="detail-container">
-    其他项目11122
-    <div class="left">
-      <el-menu
-        default-active="2"
-        class="el-menu-vertical-demo"
-        @open="handleOpen"
-        @close="handleClose">
-        <el-submenu index="1">
-          <template slot="title">
-            <i class="el-icon-location"></i>
-            <span>宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程</span>
-          </template>
-          <el-menu-item-group>
-            <template slot="title">分组一</template>
-            <el-menu-item index="1-1">选项1</el-menu-item>
-            <el-menu-item index="1-2">选项2</el-menu-item>
-          </el-menu-item-group>
-          <el-menu-item-group title="分组2">
-            <el-menu-item index="1-3">选项3</el-menu-item>
-          </el-menu-item-group>
-          <el-submenu index="1-4">
-            <template slot="title">选项4</template>
-            <el-menu-item index="1-4-1">选项1</el-menu-item>
-          </el-submenu>
-        </el-submenu>
-      </el-menu>
-    </div>
-    <div class="right">
+  <div class="otherProjects-container">
+    <div class="otherProjects-cont">
+      <div class="left">
+        <div class="left-menu">
+          <el-menu @open="handleOpen" @close="handleClose">
+            <el-submenu index="1">
+              <template slot="title">
+                <i class="el-icon-location"></i>
+                <span>宝安中学（集团）初中部改扩建工程施工总承包-加固修缮工程</span>
+              </template>
+              <el-menu-item-group>
+                <template slot="title">分组一</template>
+                <el-menu-item index="1-1">选项1</el-menu-item>
+                <el-menu-item index="1-2">选项2</el-menu-item>
+              </el-menu-item-group>
+              <el-menu-item-group title="分组2">
+                <el-menu-item index="1-3">选项3</el-menu-item>
+              </el-menu-item-group>
+              <el-submenu index="1-4">
+                <template slot="title">选项4</template>
+                <el-menu-item index="1-4-1">选项1</el-menu-item>
+              </el-submenu>
+            </el-submenu>
+          </el-menu>
+        </div>
+      </div>
+      <div class="right-table">
 
+      </div>
     </div>
   </div>
 </template>
@@ -79,14 +78,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .detail-container {
+  .otherProjects-container {
     width: 100%;
     box-sizing: border-box;
     padding: 0 24px;
     background: #ffffff;
+    height: 100%;
+    display: flex;
+    align-items: center;
     .left{
       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>