From 27e5d9d2dfd6e03aa5f7d1f3c775ec7ecd7afe78 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 24 Feb 2023 18:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/form/ProcessUdgetPlanForm.vue    |  9 ++++-
 src/views/dashboard/HomePage.vue              |  2 +-
 .../costecharts/CostAnalysis.vue              | 38 +++++++++----------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 8a0cb0b..a8af5c4 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1445,11 +1445,14 @@
        await  queryDepartTreeList().then(res=>{
           if(res.success){
             let arr = [...res.result]
+            let bian = false;
+            // console.log("asfgasdgbv",arr)
             arr.forEach(item =>{
               if(!!item.children){
                 item.children.forEach(it =>{
                   if(number === it.id){
                     // console.log("it.title",it.title);
+                    bian = true;
                     switch (it.title) {
                       // case '准东项目部第一小队':
                       //   break;
@@ -1498,12 +1501,14 @@
               }
 
             });
-
-
+            if(!bian){
+              title = year+"-"+"xj"+"-"+"1"+"-"+sortNum ;
+            }
           }else{
             title = year+"-"+"xj"+"-"+"1"+"-"+sortNum ;
           }
         })
+       // console.log("title",title);
          this.form.setFieldsValue({
            sort: title
          })
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 39f19f7..ea6ab38 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -76,7 +76,7 @@
           </a-card>
         </a-col>
         <a-col :span="12">
-          <a-card class="bottom-card" title="全部应用" style="width: 100%; height:60%; margin-top: 11px; overflow-y: hidden" :headStyle="{}" :bodyStyle="{height:'100%' , overflow:'hidden'}" >
+          <a-card class="bottom-card" title="全部应用" style="width: 100%; height:478px; margin-top: 11px; overflow-y: hidden" :headStyle="{}" :bodyStyle="{height:'100%' , overflow:'hidden'}" >
             <div style="max-height: 420px;overflow-y: auto;">
         <span class="ant-col-md-4" v-for="(item,index) in userChildren" @click="goRouteView(item.path)" :title="item.meta.title"
               style="display: inline-block; margin: 25px;">
diff --git a/src/views/statisticanalysis/costecharts/CostAnalysis.vue b/src/views/statisticanalysis/costecharts/CostAnalysis.vue
index a99e53a..04f0891 100644
--- a/src/views/statisticanalysis/costecharts/CostAnalysis.vue
+++ b/src/views/statisticanalysis/costecharts/CostAnalysis.vue
@@ -3,26 +3,26 @@
   <div style="width: 100%;height: 100%;padding-top: 2%;border-radius:15px;background-color: #9c9a9a;">
     <div style="height: 30%;margin-left: 1%;width: 100%">
       <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">分析成本</div>
-      <div style="display: flex;align-items: center;justify-content: space-between;margin-left: 5%;width: 90%">
-        <div style="display: flex;align-items: center;justify-content: flex-start;width: 42%" >
-          <div class="xian">新疆分公司</div>
-          <div class="xian">计划经营科</div>
-          <div class="xian">第一项目部</div>
-          <div class="xian">第二项目部</div>
-        </div>
-        <div style="float: right;;display: flex;align-items: center;justify-content: flex-end;width: 42%">
-          <div class="xian">年度</div>
-          <div class="xian">半年度</div>
-          <div class="xian">季度</div>
-          <div class="xian">月</div>
-        </div>
+<!--      <div style="display: flex;align-items: center;justify-content: space-between;margin-left: 5%;width: 90%">-->
+<!--        <div style="display: flex;align-items: center;justify-content: flex-start;width: 42%" >-->
+<!--          <div class="xian">新疆分公司</div>-->
+<!--          <div class="xian">计划经营科</div>-->
+<!--          <div class="xian">第一项目部</div>-->
+<!--          <div class="xian">第二项目部</div>-->
+<!--        </div>-->
+<!--        <div style="float: right;;display: flex;align-items: center;justify-content: flex-end;width: 42%">-->
+<!--          <div class="xian">年度</div>-->
+<!--          <div class="xian">半年度</div>-->
+<!--          <div class="xian">季度</div>-->
+<!--          <div class="xian">月</div>-->
+<!--        </div>-->
 
-      </div>
-      <div style="display: flex;align-items: center;justify-content: flex-start;margin-left: 5%">
-        <div class="zi">扇形图</div>
-        <div class="zi">折线图</div>
-        <div class="zi">条形图</div>
-      </div>
+<!--      </div>-->
+<!--      <div style="display: flex;align-items: center;justify-content: flex-start;margin-left: 5%">-->
+<!--        <div class="zi">扇形图</div>-->
+<!--        <div class="zi">折线图</div>-->
+<!--        <div class="zi">条形图</div>-->
+<!--      </div>-->
     </div>
     <div id="myCostAnalysis" style="width: 100%; height: 70%;padding-top: 10px"></div>
   </div>