浏览代码

Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

yuanrf 2 年之前
父节点
当前提交
baaccde254
共有 2 个文件被更改,包括 24 次插入30 次删除
  1. 23 30
      src/components/child/Controltree.vue
  2. 1 0
      src/components/system/Company.vue

+ 23 - 30
src/components/child/Controltree.vue

@@ -7,7 +7,7 @@
                     <div v-if="item.children" class="second-ul">
                         <div class="second-ul-haed">
                             <div>版块步骤</div>
-                            <div>管控时间</div>
+                            <div>预计完成时间</div>
                             <div>完成时间</div>
                         </div>
                         <div v-if="item.panduan=='wu'">
@@ -17,7 +17,7 @@
                                 <div>{{seconditem.enddate}}</div>
                             </div>
                         </div>
-                        <div v-if="item.panduan=='you'">
+                        <div v-if="item.panduan=='you'" style="padding:5px">
                             <div v-for="(seconditem,index) in item.children" :key="index" class="second-li">
                                 <span>{{seconditem.label}}</span>
                                 <div class="li-steps-ul">
@@ -52,46 +52,38 @@ export default {
                 {
                     id: 3,
                     label: "经费预算",
-                    panduan:"you",
+                    panduan:"wu",
                     children:[
                         {
                             id:15,
-                            label: "未开始"
-                        },
-                        {
-                            id:16,
-                            label: "进行中"
-                        },
-                        {
-                            id:17,
-                            label: "已完成"
+                            label: "完成经费预算",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10'
                         }
                     ]
                 },
                 {
                     id: 4,
                     label: " 市场部人员报价对接/反馈",
-                    panduan:"you",
+                    panduan:"wu",
                     children:[
                         {
                             id:18,
-                            label: "未开始"
+                            label: "完成报价对接/反馈",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10'
                         },
                         {
                             id:19,
-                            label: "进行中"
+                            label: "录入最终总经费预算",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10'
                         },
                         {
                             id:20,
-                            label: "已完成",
-                            children:[
-                                {
-                                    id:21,
-                                    label: "录入最终总经费预算及上传明细单",
-                                    date:"2023-01-12 ~ 2023-02-10",
-                                    enddate:'2023-02-10'
-                                }
-                            ]
+                            label: "上传明细单",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10'
                         }
                     ]
                 },
@@ -388,13 +380,13 @@ export default {
         position: relative;
     }
     .controltree-li:not(:last-child){
-        margin-bottom: 200px;
+        margin-bottom: 250px;
     }
     .controltree-li:not(:last-child)::after{
         content: "";
         display: inline-block;
         width: 1px;
-        height: 195px;
+        height: 245px;
         position: absolute;
         left: 50%;
         top: 44px;
@@ -407,7 +399,7 @@ export default {
         height: 1px;
         position: absolute;
         left: -75px;
-        top: 25px;
+        top: 20px;
         background-color: #F1B72C;
     }
     .controltree-li:nth-child(2n+1) .second-ul::before{
@@ -417,16 +409,15 @@ export default {
         height: 1px;
         position: absolute;
         right: -75px;
-        top: 25px;
+        top: 20px;
         background-color: #1E5DA5;
     }
     .second-ul{
         width: 480px;
         position: absolute;
-        top: -5px;
+        top: 0px;
         box-shadow: 0 0 5px #0005;
         border-radius: 5px;
-        padding: 5px;
     }
     .second-li{
         text-align: left;
@@ -447,6 +438,7 @@ export default {
         display: flex;
         justify-content: space-between;
         color: #fff;
+        border-radius: 5px 5px 0px 0px;
     }
     .second-ul-haed>div{
         padding: 10px 0;
@@ -516,6 +508,7 @@ export default {
         padding: 5px 0;
         text-align: center;
         height: 100%;
+        padding: 11px 0;
     }
     .li-steps-li{
         border: 1px solid #f7f7f7;

+ 1 - 0
src/components/system/Company.vue

@@ -0,0 +1 @@
+<template></template>