Browse Source

资料填报数量文件数量修改

duy 2 years ago
parent
commit
835ee69dc2

+ 62 - 0
src/styles/app/tree.scss

@@ -1,11 +1,14 @@
 // 树的线样式
 
+
 .tree-line {
     :deep(.el-tree-node) {
         position: relative;
         padding-left: 12px; // 缩进量
+        // width: 100%;
 
     }
+ 
     :deep(.el-tree-node__children) {
         padding-left: 12px; // 缩进量
     }
@@ -58,3 +61,62 @@
 }
 
 
+
+.tree-line1 {
+    :deep(.el-tree-node) {
+        position: relative;
+        padding-left: 12px; // 缩进量
+        width: 100%;
+
+    }
+ 
+    :deep(.el-tree-node__children) {
+        padding-left: 12px; // 缩进量
+    }
+    // 竖线
+    :deep(.el-tree-node::before) {
+        content:"";
+        height: 100%;
+        width: 1px;
+        position: absolute;
+        left: 1px;
+        top: 0px;
+        border-width: 1px;
+        border-left: 2px dashed var(--el-color-primary);
+    }
+    // 当前层最后⼀个节点的竖线⾼度固定
+    :deep(.el-tree-node:last-child::before) {
+        height: 15px; // 可以⾃⼰调节到合适数值
+    }
+    // 横线
+    :deep(.el-tree-node::after) {
+        content:"";
+        width: 16px;
+        height: 20px;
+        position: absolute;
+        left: 2px;
+        top: 12px;
+        border-width: 1px;
+        border-top: 2px dashed var(--el-color-primary);
+    }
+    // 去掉最顶层的虚线,放最下⾯样式才不会被上⾯的覆盖了
+    & > :deep(.el-tree-node::after) {
+        border-top: none !important;
+        border-top: 0px !important;
+    }
+    & > :deep(.el-tree-node::before) {
+        border-left: none;
+    }
+    // 展开关闭的icon
+    :deep(.el-tree-node__expand-icon) {
+        font-size: 16px;
+        &.is-leaf {
+            color: transparent;
+            font-size: 0px;
+        }
+    }
+    :deep(.el-tree__empty-block) {
+      min-width: 300px;
+
+    }
+}

+ 2 - 2
src/views/data-fill/components/HcTreeData.vue

@@ -1,5 +1,5 @@
 <template>
-    <ElTree class="hc-tree-node tree-line el-radio-group" ref="ElTreeRef" :props="ElTreeProps" :data="datas" highlight-current accordion node-key="primaryKeyId"
+    <ElTree class="hc-tree-node tree-line el-radio-group" :class="[ui,submitCounts?'tree-line1':'']" ref="ElTreeRef" :props="ElTreeProps" :data="datas" highlight-current accordion node-key="primaryKeyId"
             :default-expanded-keys="TreeExpandKey" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu" :indent="0"  :filter-node-method="filterNode">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
@@ -9,7 +9,7 @@
                         <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
                         <span v-else>{{ node.label }}</span>
                    </div>
-                     <div class="text-blue submit-counts" v-if="true">【{{ data.submitCounts ?? 0 }}】</div>
+                     <div class="text-blue submit-counts" v-if="submitCounts">【{{ data.submitCounts ?? 0 }}】</div>
                 </div>
                 <!-- <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div> -->
                 <!--树组件,操作菜单-->

+ 6 - 10
src/views/data-fill/components/WbsTree.vue

@@ -1,20 +1,16 @@
 <template>
-    <ElTree class="hc-tree-node tree-line el-radio-group" :class="ui" ref="ElTreeRef" :props="ElTreeProps" :load="ElTreeLoadNode" lazy highlight-current accordion node-key="primaryKeyId"
+    <ElTree class="hc-tree-node tree-line el-radio-group" :class="[ui,submitCounts?'tree-line1':'']" ref="ElTreeRef" :props="ElTreeProps" :load="ElTreeLoadNode" lazy highlight-current accordion node-key="primaryKeyId"
             :default-expanded-keys="defaultExpandedCids" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu" :indent="0">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
                 <!--树组件,节点名称-->
-                <div class="label" :class="node.level === 1?'level-name':''" 
-                style="display: flex;
-                justify-content: space-between;">
-                    <div>
+                <div class="label" :class="node.level === 1?'level-name':''" style="width: 100%;display: flex;justify-content: space-between;"
+               >
                             <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
                             <span v-else>{{ node.label }}</span>
-                    </div>  
-                   
-                      <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div>
+                            <div class="text-blue submit-counts" v-if="submitCounts">【{{ data.submitCounts ?? 0 }}】</div>
                 </div>
-                <!-- <div class="text-blue submit-counts" v-if="true">【{{ data.submitCounts ?? 0 }}】</div> -->
+               
                 <!--树组件,操作菜单-->
                 <div class="menu-icon1" :class="node.showTreeMenu?'show':''" v-if="node.level !== 1 && menusData.length > 0">
                     <div class="cu-tree-node-popover-menu-icon" @click.prevent.stop="ElTreeLabelContextMenu($event,data,node)">
@@ -283,7 +279,7 @@ defineExpose({
 <style lang="scss" scoped>
 @import "../../../styles/app/tree.scss";
 .el-radio-group {
-   width: auto !important; 
+   width: 100% !important; 
   
 }
 .data-custom-tree-node {

+ 2 - 2
src/views/data-fill/query.vue

@@ -22,14 +22,14 @@
                     <el-scrollbar>
                         <KeepAlive>
                             <template v-if="isSearchTree">
-                                <HcTreeData :datas="searchTreeData" :autoExpandKeys="treeAutoExpandKeys" submitCounts isColor 
+                                <HcTreeData :datas="searchTreeData" :autoExpandKeys="treeAutoExpandKeys" :submitCounts="true" isColor 
                                 @nodeTap="wbsElTreeClick" 
                                 :searchTreeVal="searchTreeVal"
                                 @changeSearch="changeisSearch"
                                 />
                             </template>
                             <template v-else>
-                                <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" submitCounts isColor @nodeTap="wbsElTreeClick"/>
+                                <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" :submitCounts="true" isColor @nodeTap="wbsElTreeClick"/>
                             </template>
                         </KeepAlive>
                     </el-scrollbar>

+ 12 - 2
src/views/data-fill/wbs.vue

@@ -108,10 +108,20 @@
                         <el-scrollbar>
                             <KeepAlive>
                                 <template v-if="isSearchTree">
-                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"  @changeSearch="changeisSearch" />
+                                    <HcTreeData 
+                                    :datas="searchTreeData" 
+                                    :menus="ElTreeMenu" 
+                                    :isMark="TreeMark" 
+                                    :autoExpandKeys="TreeAutoExpandKeys" 
+                                    :searchTreeVal="searchTreeVal" i
+                                    sColor @nodeTap="wbsElTreeClick"
+                                     @menuTap="ElTreeMenuClick"  
+                                     @changeSearch="changeisSearch" 
+                                     :submitCounts="false"
+                                     />
                                 </template>
                                 <template v-else>
-                                    <WbsTree :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading" />
+                                    <WbsTree :submitCounts="false" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading" />
                                 </template>
                             </KeepAlive>
                         </el-scrollbar>