新主题

src/layout/index.scss

@@ -104,7 +104,7 @@
             }
             .hc-main-page {
                 position: relative;
-                height: calc(100% - 30px);
+                height: calc(100% - 36px);
                 overflow: hidden;
                 padding: 12px;
             }

src/styles/data-fill/wbs.scss

@@ -5,10 +5,10 @@
     .hc-layout-left-box {
         width: 382px;
         position: relative;
-        background: #f1f5f8;
+        background: white;
         border-radius: 10px;
         transition: 0.2s;
-        margin-right: 24px;
+        margin-right: 16px;
         margin-left: -24px;
         visibility: hidden;
         box-shadow: -2px 0 10px 0 rgba(32, 37, 50, 0.03), 0 10px 21px 20px rgba(32, 37, 50, 0.03);
@@ -49,13 +49,17 @@
             position: relative;
             padding: 15px 20px;
             height: calc(100% - 187px);
+            .hc-tree-back-to {
+                font-size: 12px;
+                margin-bottom: 10px;
+            }
             .hc-search-tree-val {
                 position: relative;
-                margin-bottom: 24px;
+                margin-bottom: 10px;
             }
             .hc-tree-scrollbar {
                 position: relative;
-                height: calc(100% - 68px);
+                height: calc(100% - 44px);
             }
         }
         .hc-tree-foot-tip-box {

src/views/data-fill/wbs.vue

@@ -3,7 +3,7 @@
         <div v-if="wbsTypeTabKey === 'tree'" v-loading="nodeSaveLoading" class="hc-layout-box" element-loading-text="批量保存数据中...">
             <div
                 id="wbs-left-tree" :class="[isWbsTreeShow ? 'show' : '', isMouseTree ? 'on-transition' : '']"
-                :style="`width:${isWbsTreeShow ? leftWidth : 0}px;`"
+                :style="`width:${isWbsTreeShow ? leftWidth : 0}px; ${isWbsTreeShow ? '' : 'display: none'}`"
                 class="hc-layout-left-box"
             >
                 <div class="hc-project-box">
@@ -11,36 +11,22 @@
                         <HcIcon name="stack" />
                     </div>
                     <div class="ml-2 project-name-box">
-                        <span class="text-xl text-cut project-alias">{{ projectInfo.projectAlias }}</span>
-                        <div class="text-xs text-cut project-name">
-                            {{ projectInfo.name }}
-                        </div>
+                        <div class="project-alias">{{ projectInfo.name }}</div>
                     </div>
                 </div>
                 <div class="hc-tree-box">
+                    <div class="hc-tree-back-to">
+                        <el-link type="primary">回到上一次填报部位</el-link>
+                        <el-link type="warning" class="ml-4" @click="wbsMapTypeTab">导图结构填报</el-link>
+                    </div>
                     <div class="hc-search-tree-val">
-                        <el-input
-                            v-model="searchTreeVal" block clearable placeholder="请输入名称关键词检索"
-                            size="large" @keyup="searchTreeKeyUp"
-                        >
+                        <el-input v-model="searchTreeVal" block clearable placeholder="请输入名称关键词检索" @keyup="searchTreeKeyUp">
                             <template #suffix>
                                 <HcIcon name="search-2" ui="text-xl iscusor" @click="searchTreeClick" />
                             </template>
                         </el-input>
                     </div>
                     <div v-if="isShowLeft" id="hc-tree-scrollbar" v-loading="treeLoading" class="hc-tree-scrollbar" element-loading-text="获取数据中...">
-                        <!-- <HcTreeV2
-                            :isShow="isSearchTree"
-                            :datas="searchTreeData"
-                            :height="searchTreeHeight"
-                            :isMark="TreeMark"
-                            :menus="ElTreeMenu"
-                            :searchVal="searchTreeVal"
-                            isCounts
-                            isType
-                            @menuTap="ElTreeMenuClick"
-                            @nodeTap="wbsElTreeClick"
-                        /> -->
                         <el-scrollbar v-show="isSearchTree" class="scroll-bar-right-16">
                             <HcDataTree
                                 :datas="searchTreeData"
@@ -74,18 +60,10 @@
                     </div>
                 </div>
                 <div class="hc-tree-foot-tip-box">
-                    <div class="dot-view green">
-                        已审批
-                    </div>
-                    <div class="dot-view black">
-                        未填报
-                    </div>
-                    <div class="dot-view orange">
-                        已填报-待审批
-                    </div>
-                    <div class="dot-view blue">
-                        已填报-未上报
-                    </div>
+                    <div class="dot-view green">已审批</div>
+                    <div class="dot-view black">未填报</div>
+                    <div class="dot-view orange">已填报-待审批</div>
+                    <div class="dot-view blue">已填报-未上报</div>
                 </div>
                 <!-- 左右拖动 -->
                 <div class="horizontal-drag-line" @mousedown="onmousedown" />
@@ -96,8 +74,7 @@
                     <HcIcon v-show="isWbsTreeShow" name="arrow-left-s" />
                     <HcIcon v-show="!isWbsTreeShow" name="arrow-right-s" />
                 </div>
-
-                <HcCard action-ui="text-center">
+                <HcCard class="bg-white" action-ui="text-center">
                     <template #header>
                         <HcNewSwitch
                             :datas="authBtnTabdata" :keys="authBtnTabKey" :round="false"
@@ -108,6 +85,14 @@
                     <template #extra>
                         <HcNewSwitch :datas="wbsTypeTab" :keys="wbsTypeTabKey" @change="wbsTypeTabChange" />
                     </template>
+                    <el-tabs type="border-card">
+                        <el-tab-pane label="User">User</el-tab-pane>
+                        <el-tab-pane label="Config">Config</el-tab-pane>
+                        <el-tab-pane label="Role">Role</el-tab-pane>
+                        <el-tab-pane label="Task">Task</el-tab-pane>
+                    </el-tabs>
+
+
                     <!-- 清表列表 -->
                     <el-scrollbar v-if="ListItemDatas.length > 0" ref="ListItemScrollRef" v-loading="ListItemLoading">
                         <CollapseForm
@@ -906,6 +891,11 @@ const wbsTypeTabChange = (item) => {
     })
     getSearchTreeData()
 }
+//切换导图结构
+const wbsMapTypeTab = () => {
+    wbsTypeTabChange({ key: 'map', name: '导图结构填报' })
+}
+
 
 //上传文件的
 const HcUploadFileRef = ref(null)
@@ -2144,9 +2134,9 @@ const NodeSaveClick = async () => {
 }
 .hc-expansion-contraction-tree {
     position: absolute;
-    left: -21px;
+    left: -13px;
     top: 0;
-    width: 18px;
+    width: 10px;
     height: 100%;
     user-select: none;
     cursor: pointer;