diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue
index 9094586c..73ab26ab 100644
--- a/src/views/xm/XmOverview.vue
+++ b/src/views/xm/XmOverview.vue
@@ -1,246 +1,381 @@
 <template>
-  <section class="page-container">
-    <div class="page-main">
-      <div class="row_1">
-        <div class="r r1">
-          <span style="color: #4779F6">{{formatNum(xmBranchState.projectCnt,0) || 0}}</span>
-          <p>项目数</p>
-        </div>
-        <div class="r r2">
-          <span style="color: #4779F6">{{formatNum(xmBranchState.budgetWorkload,0) || 0}}</span>
-          <p>项目总工时</p>
-        </div>
-        <div class="r r3">
-          <span style="color: #F6AE47">{{formatNum(xmBranchState.productCnt,0) || 0}}</span>
-          <p>产品数</p>
-        </div>
-        <div class="r r4">
-          <span style="color: #F6AE47">{{formatNum(xmBranchState.productBudgetWorkload,0) || 0}}</span>
-          <p>产品总工时</p>
-        </div>
-        <div class="r r5">
-          <span style="color: #47CBF6">{{formatNum(xmBranchState.phaseCnt,0) || 0}}</span>
-          <p>计划数</p>
-        </div>
-        <div class="r r6">
-          <span style="color: #47CBF6">{{formatNum(xmBranchState.iterationCnt,0) || 0}}</span>
-          <p>迭代数</p>
-        </div>
-        <div class="r r7">
-          <span style="color: #F68D47">{{formatNum(xmBranchState.planWorkerCnt,0) || 0}}</span>
-          <p>总人数</p>
-        </div>
-        <div class="r r8">
-          <span style="color: #7D7D7D">{{formatNum(xmBranchState.taskCnt,0) || 0}}</span>
-          <p>任务数</p>
-        </div>
-        <div class="r r9">
-          <span style="color: #7D7D7D">{{formatNum(xmBranchState.menuCnt,0) || 0}}</span>
-          <p>需求数</p>
-        </div>
-      </div>
+  <section>
+    <el-row :style="{overflowX: 'hidden',height:maxTableHeight+'px'}" ref="table"> 
+      <el-row :gutter="10">
+          <el-col :span="8" >
+            <el-card class="box-card" style="padding:0px ;height:425px">
+              <div slot="header" class="clearfix">
+                <span>企业信息</span>
 
-      <div class="row_2">
-        <div class="r1">
-          <p class="r_text">项目进度</p>
-          <div class="message">
-            <div>
-              <span>{{formatNum(this.xmBranchState.estimateWorkload,0) || 0}}h</span>
-              <p>预估工时</p>
-            </div>
-            <div>
-              <span>{{formatNum(this.xmBranchState.actWorkload,0) || 0}}h</span>
-              <p>登记工时</p>
-            </div>
-            <div>
-              <span>{{ formatNum(workloadProgress,0) || 0}}%</span>
-              <p>工时进度</p>
-            </div>
-            <div>
-              <span>{{ formatNum(remainWorkload,0) || 0}}h</span>
-              <p>剩余工时</p>
-            </div>
-            <div>
-              <span>{{ formatNum(deviation,0)|| 0}}h</span>
-              <p>预估偏差</p>
-            </div>
-            <div>
-              <span>{{ formatNum(deviationRate,0) || 0}}%</span>
-              <p>预估偏差率</p>
-            </div>
-          </div>
-          <div style="padding: 0 40px">
-            <el-divider></el-divider>
-          </div>
-          <div class="chart">
-            <div class="desc">
-              <span>项目预计进度</span>
-              <span>项目实际进度</span>
-            </div>
-            <div class="process">
-              <el-progress class="pc" :stroke-width="14" :percentage="planProgress"></el-progress>
-              <el-progress class="pc" :stroke-width="14" color="#47CBF6" :percentage="realProgress"></el-progress>
-            </div>
-          </div>
-        </div>
+                <el-popover
+                  placement="bottom"
+                  title="标题"
+                  width="200"
+                  trigger="click" > 
 
-        <div class="r2">
-          <p class="r_text">工作量分布</p>
-          <div class="chart">
-            <div id="workloadDistribution" :style="{width: '100%', height: '250px'}"></div>
-          </div>
-        </div>
-      </div>
+                  <el-row>
+                    <el-button type="primary" @click="loadTasksToXmBranchState" v-loading="load.calcProduct">计算企业汇总数据</el-button>
+                    <br>
+                      <font color="blue" style="font-size:10px;">将从项目任务及企业任务中汇总进度、预算工作量、实际工作量、预算金额、实际金额、缺陷数、需求数等数据到企业统计表</font>
+                  </el-row>
+                  <el-row>
+                    <el-button  type="primary" @click="loadTasksToXmMenuState"  v-loading="load.calcMenu">计算所有需求数据</el-button>
+                    <br>
+                      <font color="blue"  style="font-size:10px;">将从项目任务汇总进度、预算工作量、实际工作量、预算金额、实际金额等数据到需求统计表</font>
+                  </el-row>
 
-      <div class="row_3">
-        <div class="r1">
-          <p class="r_text">任务每日状态趋势</p>
-          <div class="chart">
-            <div id="taskChart" :style="{width: '100%', height: '320px'}"></div>
-          </div>
-        </div>
-        <div class="r2">
-          <p class="r_text">工作项数量分布</p>
-          <div class="chart">
-            <div id="allChart" :style="{width: '100%', height: '320px'}"></div>
-          </div>
-        </div>
-      </div>
+                  <el-button slot="reference" style="float:right;" icon="el-icon-video-play" type="text">统计</el-button>
+                </el-popover>
+               
+              </div>
+              <el-row style="margin-bottom:10px">
+                <el-row>
+                  <span>企业</span>&nbsp;<span><b>{{userInfo.branchName}}</b></span> 
+                 </el-row> 
+              </el-row>
+              <el-row style="margin-bottom:10px">
+                <el-col :span="8">
+                  <div class="item">
+                    <div class="icon" style="background-color:  rgb(79, 140, 255);">
+                      <i class="el-icon-right"></i>
+                    </div>
+                    <div class="info">
+                      <div v-text="totalTask"></div>
+                      <div class="title">总任务量</div>
+                    </div>
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="item">
+                    <div class="icon" style="background-color:  rgb(255, 153, 51);">
+                      <i class="el-icon-loading"></i>
+                    </div>
+                    <div class="info">
+                      <div v-text="notStart">
+                      </div>
+                      <div class="title">待完成</div>
+                    </div>
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <div class="item">
+                    <div class="icon" style="background-color:  rgb(0, 153, 51);">
+                      <i class="el-icon-check"></i>
+                    </div>
+                    <div class="info">
+                      <div v-text="competeTasks" >
+                      </div>
+                      <div class="title">已完成</div>
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row style="margin-bottom:10px">
+                <div class="item">
+                  <div class="icon2" style="background-color:  rgb(204, 204, 204);">
+                    <i class="el-icon-date"></i>
+                  </div>
+                  <div class="info">
+                    <div v-text="xmBranch.calcTime">
+                    </div>
+                    <div class="title">企业数据更新日期</div>
+                  </div>
+                </div>
+              </el-row>
+              <el-row style="margin-bottom:10px">
+                <div class="item">
+                  <div class="icon2" style="background-color:  rgb(204, 204, 204);">
+                    <i class="el-icon-star-off"></i>
+                  </div>
+                  <div class="info">
+                    <div class="title"> 需求数： {{this.xmBranch.menuCnt||0}}</div>
+                  </div>
+                </div>
+              </el-row> 
+              <el-row style="margin-bottom:10px">
+                <div class="item">
+                  <div class="icon2" style="background-color:  rgb(204, 204, 204);">
+                    <i class="el-icon-alarm-clock"></i>
+                  </div>
+                  <div>
+                    <div class="progress-item">
+                      <el-progress :percentage="realProgress">
+                      </el-progress>
+                      
+                      <el-tag v-if="planProgress>realProgress" type="danger" effect="dark">整体进度 落后{{ planProgress-realProgress }}%</el-tag>
+                          <el-tag v-else-if="planProgress<realProgress" type="warning" effect="dark">整体进度 超前{{ realProgress-planProgress }}%</el-tag>
+                          <el-tag v-else effect="dark" type="success">整体进度 理想</el-tag>
+                      <div class="title">
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </el-row>
+            </el-card>
+          </el-col>
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>总预算情况</span>
+              </div>
+              <div>
+                <div id="planTotalCostPie" :style="{width: '100%', height: '320px'}"></div>
+              </div>
+            </el-card>
+          </el-col>  
 
-      <div class="row_4">
-        <div class="r4_1">
-          <p class="r_text">总预算情况</p>
-          <div class="chart">
-            <div id="planTotalCostPie" :style="{width: '100%', height: '410px'}"></div>
-          </div>
-        </div>
-        <div class="r4_2">
-          <p class="r_text">总缺陷情况</p>
-          <div class="chart">
-            <div id="bugPieChart" :style="{width: '100%', height: '410px'}"></div>
-          </div>
-        </div>
-        <div class="r4_3">
-          <p class="r_text">所含产品和迭代情况</p>
-          <div class="chart">
-            <div id="iterationAndProduct" :style="{width: '100%', height: '320px'}"></div>
-          </div>
-        </div>
-      </div>
-    </div>
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>关联企业和迭代情况</span>
+              </div>
+              <div>
+                <div id="iterationAndProduct" :style="{width: '100%', height: '350px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" style="margin-bottom:10px">
+          <el-col :span="16" >
+            <el-card class="box-card" style="padding:0px ;height:425px">
+              <div slot="header" class="clearfix">
+                <span>企业工时</span>
+              </div>
+              <div>
+                <el-row  >
+                  <div class="item">
+                    <el-col :span="8">
+                      <div>
+                        <div style="text-align:center;">
+                          <span style="font-size:24px;" v-text="this.xmBranch.budgetWorkload"></span>
+                          <span style="font-size:5px;">h</span>
+                        </div>
+                        <div style="text-align:center;font-size:5px;">总估工时</div>
+                      </div>
+                    </el-col>
+                    <el-col :span="8">
+                      <div>
+                        <div style="text-align:center;">
+                          <span style="font-size:24px;" v-text="this.xmBranch.estimateWorkload"></span>
+                          <span style="font-size:5px;">h</span>
+                        </div>
+                        <div style="text-align:center;font-size:5px;">应完成工时</div>
+                      </div>
+                    </el-col>
+                    <el-col :span="8">
+                      <div>
+                        <div style="text-align:center;">
+                          <span style="font-size:24px;" v-text="this.xmBranch.actWorkload"></span>
+                          <span style="font-size:5px;">h</span>
+                        </div>
+                        <div style="text-align:center;font-size:5px;" title="已登记的工时">已完成工时</div>
+                      </div>
+                    </el-col> 
+                  </div>
+                </el-row>
+                <el-row  >
+                  <div class="item">
+                    <el-col :span="8">
+                      <div title="总估工时-已完成工时">
+                        <div style="text-align:center;">
+                          <span style="font-size:24px;" v-text="remainWorkload"></span>
+                          <span style="font-size:5px;">h</span>
+                        </div>
+                        <div style="text-align:center;font-size:5px;">剩余工时</div>
+                      </div>
+                    </el-col>
+                    <el-col :span="8">
+                      <div title="已完成工时-当前应完成工时">
+                        <div style="text-align:center;">
+                          <span style="font-size:24px;" v-text="deviation"></span>
+                          <span style="font-size:5px;">h</span>
+                        </div>
+                        <div style="text-align:center;font-size:5px;">预估偏差</div>
+                      </div>
+                    </el-col>
+                    <el-col :span="8">
+                      <div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
+                        <div style="text-align:center;">
+                          <span style="font-size:24px;" v-text="deviationRate"></span>
+                          <span style="font-size:5px;">%</span>
+                        </div>
+                        <div style="text-align:center;font-size:5px;">预估偏差率</div>
+                      </div>
+                    </el-col>
+                  </div>
+                </el-row>
+                <el-row>
+                  <span style="margin-left:20px;" title="应完成工时/总预估工时">预计进度</span>
+                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;"   :stroke-width="14" :percentage="planProgress"></el-progress>
+                </el-row>
+                <el-row>
+                  <span style="margin-left:20px;" title="实际工时/总预估工时">实际进度</span>
+                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;"  color="#47CBF6" :stroke-width="14" :percentage="realProgress"></el-progress>
+                </el-row>
+
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>合作开发工作量分布</span>
+              </div>
+              <div>
+                <div id="workloadDistribution" :style="{width: '100%', height: '320px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row> 
+        <el-row :gutter="10" style="margin-bottom:10px">
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>所有工作项数量分布</span>
+              </div>
+              <div>
+                <div id="allChart" :style="{width: '100%', height: '350px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>需求情况</span>
+              </div>
+              <div>
+                <div id="menuChart" :style="{width: '100%', height: '320px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+          
+          <el-col :span="8" >
+            <el-card class="box-card" style="padding:0px ;height:425px">
+              <div slot="header" class="clearfix">
+                <span>任务状态分布</span>
+              </div>
+              <div>
+                <div id="taskChart" :style="{width: '100%', height: '350px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+          
+        </el-row>
+        <el-row :gutter="10" style="margin-bottom:10px">
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>测试用例情况</span>
+              </div>
+              <div>
+                <div id="testCasePieChart" :style="{width: '100%', height: '320px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+          
+          <el-col :span="8" >
+            <el-card class="box-card" style="height:425px">
+              <div slot="header" class="clearfix">
+                <span>缺陷情况</span>
+              </div>
+              <div>
+                <div id="bugPieChart" :style="{width: '100%', height: '320px'}"></div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row>
+    </el-row>
   </section>
 </template>
 
 <script>
 import util from "@/common/js/util"; // 全局公共库
-import { mapGetters } from "vuex"; 
-import { listXmBranchState  } from '@/api/xm/core/xmBranchState'; 
-import { listXmBranchFiveDayTaskCnt  } from '@/api/xm/core/xmBranchStateHis';
-import Guider from '@/components/Guider/Index.js';
+import { mapGetters } from "vuex";
+import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
+	import { listXmBranchState} from '@/api/xm/core/xmBranchState'; 
+import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; 
+  import {  loadTasksToXmBranchState} from '@/api/xm/core/xmBranchState';
+  import store from '@/store'
 export default {
   computed: {
     ...mapGetters(["userInfo"]),
-    finish: function (){
-      return this.xmBranchState.taskFinishCnt;
+    competeTasks: function (){
+      return this.xmBranch.taskCnt-this.xmBranch.taskUnstartCnt-this.xmBranch.taskExecCnt;
     },
     notStart: function() {
-      return this.xmBranchState.taskCnt-this.xmBranchState.taskFinishCnt;
+      return  this.xmBranch.taskUnstartCnt+this.xmBranch.taskExecCnt;
     },
     totalTask: function() {
-      return this.xmBranchState.taskCnt;
-    },
-    taskProgress: function (){
-      return this.xmBranchState.finishRate;
-    },
+      return this.xmBranch.taskCnt;
+    }, 
     taskStartTime: function (){
-      return this.xmBranchState.startTime.substring(0,10);
+      return this.xmBranch.startTime?this.xmBranch.startTime.substring(0,10):'';
     },
     taskEndTime: function (){
-      return this.xmBranchState.endTime.substring(0,10);
+      return this.xmBranch.endTime?this.xmBranch.endTime.substring(0,10):'';
     },
-    taskMng: function (){
-      return this.xmBranchState.createUsername;
+    pmUsername: function (){
+      return this.xmBranch.pmUsername;
     },
-    workloadProgress:function (){ 
-      if(!this.xmBranchState.budgetWorkload){
+    workloadProgress:function (){
+      if(!this.xmBranch.actWorkload||!this.xmBranch.budgetWorkload){
         return 0;
       }
-      if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
-        return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.budgetWorkload*100)
-      }else{
-        return 100;
-      }
+      return Math.round(this.xmBranch.actWorkload/this.xmBranch.budgetWorkload*100);
     },
     deviation:function (){
-      return Math.round(this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload);
+      
+        return  this.xmBranch.actWorkload-this.xmBranch.estimateWorkload
+       
     },
     deviationRate:function (){
-      return Math.round((this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
+      return Math.round(this.deviation/this.xmBranch.estimateWorkload*100);
     },
     remainWorkload:function (){
-      return this.xmBranchState.budgetWorkload - this.xmBranchState.actWorkload;
+      return Math.round(this.xmBranch.budgetWorkload - this.xmBranch.actWorkload);
     },
-
     planProgress:function (){
-      if(!this.xmBranchState.budgetWorkload){
+      if(!this.xmBranch.estimateWorkload||!this.xmBranch.budgetWorkload){
         return 0;
       }
-      return Math.round( this.xmBranchState.estimateWorkload/this.xmBranchState.budgetWorkload*100)
+        return Math.round(this.xmBranch.estimateWorkload/this.xmBranch.budgetWorkload*100);
     },
-
     realProgress:function (){
-      if(!this.xmBranchState.budgetWorkload){
+      if(!this.xmBranch.actWorkload||!this.xmBranch.budgetWorkload){
         return 0;
       }
-      if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
-        return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.budgetWorkload*100)
+      if(this.xmBranch.actWorkload < this.xmBranch.budgetWorkload){
+        return Math.round(this.xmBranch.actWorkload/this.xmBranch.budgetWorkload*100)
       }else{
         return 100;
       }
     },
-    xmTaskFiveDaysCpd(){
-      if(this.xmBranchFiveDayTaskCnts.length==0){
-        return [
-          ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-          [120, 132, 101, 134, 90, 230, 210],
-          [220, 182, 191, 234, 290, 330, 310]
-        ]
-      }else{ 
-        var datas=this.xmBranchFiveDayTaskCnts;
-         datas.sort((a,b)=>Date.parse(a.bizDate) - Date.parse(b.bizDate));
-          var datas2=[
-            datas.map(i=>this.getWeek(i.bizDate)),
-            datas.map(i=>i.taskUnstartCnt),
-            datas.map(i=>i.taskExecCnt)
-          ]
-          return datas2;
-      }
-      
-    },
     xmBranchStateCpd(){
-      return this.xmBranchState
-    },
+      return this.xmBranch
+    }, 
 
   },
-  watch:{
+
+   watch:{
     xmBranchStateCpd:function(){
-      this.drawWorkload();
       this.drawAllBar();
-      this.drawCostPie();
+      this.drawTask();
+      this.drawTestCasePie();
       this.drawPieBug();
+      this.drawCostPie();
+      this.drawWorkload();
       this.drawIterationProduct();
-    },
-    xmTaskFiveDaysCpd:function(){ 
-      this.drawTaskByDate();
     }
   },
   data() {
     return {
+      xmBranch:{},
+      load:{list:false,add:false,calcProject:false,calcSettle:false},
       isActive: true,
-      xmBranchState:{},
       maxTableHeight:300,
-      xmBranchFiveDayTaskCnts:[],
-     // options: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+      dicts:{
+        xmBranchPstatus:[]
+      },//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
     };
   },
 
@@ -249,72 +384,69 @@ export default {
       // 基于准备好的dom，初始化echarts实例
       let allChart = this.$echarts.init(document.getElementById("allChart"));
       let option = {
-        color:['#A3BCFA', '#A3BCFA', '#A3BCFA'],
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
         grid: {
           left: '3%',
           right: '4%',
-          bottom: '3%',
+          bottom: '10%',
           containLabel: true
         },
         yAxis: {
-          type: 'value',
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          }, 
+          type: 'value'
         },
         xAxis: {
           type: 'category',
-          boundaryGap: true,
-          data: ['需求', '任务', '缺陷'], 
+          data: ['需求', '任务','用例', '缺陷']
         },
         series: [
           {
-            name: '需求',
-            type: 'line',
-            stack: 'Total', 
-            emphasis: {
-              focus: 'series'
-            },
-            data: [this.xmBranchState.menuCnt],
-            markPoint: {
-              data: [{
-                type: 'max',
-                name: 'max'
-              }],
-            }
-          },
-          {
-            name: '任务',
-            type: 'line',
-            stack: 'Total', 
-            emphasis: {
-              focus: 'series'
-            },
-            data: [0, this.xmBranchState.taskCnt],
-            markPoint: {
-              data: [{
-                type: 'max',
-                name: 'max'
-              }],
-            },
-          },
-          {
-            name: '缺陷',
-            type: 'line',
-            stack: 'Total', 
-            emphasis: {
-              focus: 'series'
-            },
-            data: [0,  0, this.xmBranchState.bugCnt],
-            markPoint: {
-              data: [{
-                type: 'max',
-                name: 'max'
-              }],
+            label: {
+              normal:{
+                show: true,
+                position: 'top',
+                color:'#000000',
+              }
             },
+            data: [
+              {
+                value: this.xmBranch.menuCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#91CC75'
+                  }
+                }
+              },
+              {
+                value: this.xmBranch.taskCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#FAC858'
+                  }
+                }
+              },
+              {
+                value: this.xmBranch.testCases,
+                itemStyle: {
+                  normal:{
+                    color: '#99CCFF'
+                  }
+                }
+              },
+              {
+                value: this.xmBranch.bugCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#EE6666'
+                  }
+                }
+              },
+            ],
+            type: 'bar'
           }
         ]
       };
@@ -322,291 +454,273 @@ export default {
       // 绘制图表
       allChart.setOption(option);
     },
-    drawTaskByDate() {
+    
+    drawMenuPie() {
+      let taskChart = this.$echarts.init(document.getElementById("menuChart"));
+      let option = {  
+						title: { 
+							left: 'center'
+						}, 
+						tooltip: {
+							trigger: 'item',
+							
+						}, 
+						calculable: true,
+						
+						legend:{
+              show:true,
+							bottom: 'bottom',
+							data:['打开','执行中','已完成','已关闭'],
+						},
+						graphic: {
+							type: 'text',
+							left: 'center',
+              top: '40%',
+							style: {
+							// text: '总数',
+							text:
+								'需求数'+this.xmBranch.menuCnt,
+
+							textAlign: 'center',
+							fill: '#333',
+							width: 30,
+							height: 30,
+							fontSize: 14
+							}
+						}, 
+
+						series: [
+							{
+							type: 'pie',
+              center:['50%','40%'],
+							radius: ['35%','60%'],
+							data:[{name:'打开',value:this.xmBranch.menuUnstartCnt},{name:'执行中',value:this.xmBranch.menuExecCnt},{name:'已完成',value:this.xmBranch.menuFinishCnt},{name:'已关闭',value:this.xmBranch.menuCloseCnt}],
+							emphasis: {
+								itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+								}
+							},
+
+							label: {
+								show: true, 
+								formatter:'{b}: {c}  ({d}%)'
+							},
+							}
+						] 
+      };
+
+      // 绘制图表
+      taskChart.setOption(option);
+    },
+    
+    drawTestCasePie() {
+      let taskChart = this.$echarts.init(document.getElementById("testCasePieChart"));
+      let option = {  
+						title: { 
+							left: 'center'
+						}, 
+						tooltip: {
+							trigger: 'item',
+							
+						}, 
+						calculable: true,
+						
+						legend:{
+              show:true,
+							bottom: 'bottom',
+							data:['设计中','执行中','已完成'],
+						},
+						graphic: {
+							type: 'text',
+							left: 'center',
+              top: '40%',
+							style: {
+							// text: '总数',
+							text:
+								'用例数'+this.xmBranch.testCases,
+
+							textAlign: 'center',
+							fill: '#333',
+							width: 30,
+							height: 30,
+							fontSize: 14
+							}
+						}, 
+
+						series: [
+							{
+							type: 'pie',
+              center:['50%','40%'],
+							radius: ['35%','60%'],
+							data:[{name:'设计中',value:this.xmBranch.designCases},{name:'执行中',value:this.xmBranch.execCases},{name:'已完成',value:this.xmBranch.finishCases}],
+							emphasis: {
+								itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+								}
+							},
+
+							label: {
+								show: true, 
+								formatter:'{b}: {c}  ({d}%)'
+							},
+							}
+						] 
+      };
+
+      // 绘制图表
+      taskChart.setOption(option);
+    },
+    drawTask() {
       let taskChart = this.$echarts.init(document.getElementById("taskChart"));
-      let option = {
-        tooltip: {
-          trigger: 'axis'
-        },
-        color:['#76AEF7', '#A8E5FA'],
-        legend: {
-          data: ['未开始', '进行中']
-        },
-        grid: {
-          left: '1%',
-          right: '3%',
-          bottom: '5%',
-          containLabel: true
-        },
-        xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          data: this.xmTaskFiveDaysCpd[0],
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .05)'
-            }
-          },
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .1)'
-            }
-          },
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .1)'
-            }
-          },
-          axisLabel: {
-            color: '#555'
-          }
-        },
-        yAxis: {
-          type: 'value',
-          boundaryGap: false,
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          splitLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .05)'
-            }
-          }
-        },
-        series: [
-          {
-            name: '未开始',
-            type: 'line',
-            smooth: true,
-            data: this.xmTaskFiveDaysCpd[1],
-            areaStyle: {},
-            label: {
-              show: true,
-              position: 'right',
-              color: '#888',
-              formatter: ({
-                data
-              }) => data == 0 ? '' : `${data}`
-            },
-            markPoint: {
-              data: [
-                {
-                  type: 'min',
-                  name: 'min'
-                },
-                {
-                  type: 'max',
-                  name: 'max'
-                }
-              ],
+      let option = {  
+						title: { 
+							left: 'center'
+						}, 
+						tooltip: {
+							trigger: 'item',
+							
+						}, 
+						calculable: true, 
+
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '10%',
+              containLabel: true
             },
-            areaStyle: {
-              normal: {
-                color: {
-                    type: "linear",
-                    x: 0,
-                    y: 0,
-                    x2: 0,
-                    y2: 1,
-                    colorStops: [
-                      {
-                        offset: 0,
-                        color: "rgba(118,174,247,.4)"
-                      },
-                      {
-                        offset: 1,
-                        color: "rgba(118,174,247,0)"
-                      }
-                    ]
-                }
-              }
+            yAxis: {
+              type: 'value'
             },
-          },
-          {
-            name: '进行中',
-            type: 'line',
-            smooth: true,
-            data: this.xmTaskFiveDaysCpd[2],
-            areaStyle: {
-              opacity: 0.8,
-              color: 'rgb(55, 162, 255)'
-            },
-            label: {
-              show: true,
-              position: 'right',
-              color: '#888',
-              formatter: ({
-                data
-              }) => data == 0 ? '' : `${data}次`
+            xAxis: {
+              type: 'category',
+							data:['未开始','执行中','已完工','已结算','已关闭'],
             },
-            markPoint: {
-              data: [
-                {
-                  type: 'min',
-                  name: 'min'
-                },
-                {
-                  type: 'max',
-                  name: 'max'
+						series: [
+							{
+              label: {
+                normal:{
+                  show: true,
+                  position: 'top',
+                  color:'#000000',
                 }
-              ],
-            },
-            areaStyle: {
-              normal: {
-                color: {
-                    type: "linear",
-                    x: 0,
-                    y: 0,
-                    x2: 0,
-                    y2: 1,
-                    colorStops: [
-                      {
-                        offset: 0,
-                        color: "rgba(35,184,210,.2)"
-                      },
-                      {
-                        offset: 1,
-                        color: "rgba(35,184,210,0)"
-                      }
-                    ]
+              },
+							type: 'bar',
+              center:['50%','40%'],  
+
+							data:[
+                {name:'未开始',value:this.xmBranch.taskUnStartCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#FAC858'
+                  }
                 }
-              }
-            },
-          },
-        ],
+                },
+                {name:'执行中',value:this.xmBranch.taskExecCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#91CC75'
+                  }
+                }},
+                {name:'已完工',value:this.xmBranch.taskFinishCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#FAC858'
+                  }
+                }},
+                {name:'已结算',value:this.xmBranch.taskSetCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#99CCFF'
+                  }
+                }},
+                {name:'已关闭',value:this.xmBranch.taskCloseCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#EE6666'
+                  }
+                }}],  
+							}
+						] 
       };
+
       // 绘制图表
       taskChart.setOption(option);
     },
-
-    formatNum(num,defVal){
-      if(num){
-       return parseInt(num)
-      }else{
-        return defVal
-      }
-    },
     drawPieBug() {
       let bugPieChart = this.$echarts.init(document.getElementById("bugPieChart"));
       let option = {
+        title: { 
+							left: 'center'
+						}, 
         tooltip: {
           trigger: 'item',
           formatter: '{b} : {c} ({d}%)'
         },
-        legend: {
-          orient: 'horizontal',
-          bottom: '80',
-          data: ['已关闭', '已解决', '已激活', '已确认'],
-          itemGap: 30,
+        legend: {   
+          show:true,
+					bottom: 'bottom',
+          data:['已激活','已确认','已解决','已关闭']
         },
+        graphic: {
+          type: 'text',
+          left: 'center',
+          top: '40%',
+          style: {
+          // text: '总数',
+          text:
+            '缺陷数'+this.xmBranch.bugCnt,
+
+          textAlign: 'center',
+          fill: '#333',
+          width: 30,
+          height: 30,
+          fontSize: 14
+          }
+        }, 
         series: [
           {
-            center:['48%','40%'],//饼图位置
+
             type: 'pie',
-            radius: '50%',//饼图半径大小
-            label:{            //饼图图形上的文本标签
-              normal:{
-                show:true,
-                position:'outer', //标签的位置:内部
-                textStyle : {
-                  fontWeight : 100 ,
-                  fontSize: document.body.clientWidth / 120, //标签字体大小
-                  color: "#000000"
-                },
-                formatter:'{b}\n{c}({d}%)',//b：name,c:value,d:占比
-                alignTo:'edge',
-                margin:10
-              }
+            center:['50%','40%'],
+            radius: ['35%','60%'],
+            label:{ 
+								show: true, 
+								formatter:'{b}: {c}  ({d}%)'
             },
             data: [
-              {value: this.xmBranchState.closedBugs,
+              {value: this.xmBranch.activeBugs,
                 itemStyle: {
                   normal:{
-                    color: '#47CBF6'
+                    color: '#FAC858'
                   }
                 },
-                name: '已关闭',
-                label: {
-                  normal: {
-                    color: '#47CBF6'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.resolvedBugs,
+                name: '已激活'},
+              {value: this.xmBranch.confirmedBugs,
                 itemStyle: {
                   normal:{
-                    color: '#88B0BA'
+                    color: '#EE6666'
                   }
                 },
-                name: '已解决',
-                label: {
-                  normal: {
-                    color: '#88B0BA'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.activeBugs,
+                name: '已确认'},
+              {value: this.xmBranch.resolvedBugs,
                 itemStyle: {
                   normal:{
-                    color: '#F6AD48'
+                    color: '#91CC75'
                   }
                 },
-                name: '已激活',
-                label: {
-                  normal: {
-                    color: '#F6AD48'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.confirmedBugs,
+                name: '已解决'},
+              {value: this.xmBranch.closedBugs,
                 itemStyle: {
                   normal:{
-                    color: '#467AF6'
+                    color: '#5470C6'
                   }
                 },
-                name: '已确认',
-                label: {
-                  normal: {
-                    color: '#467AF6'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
+                name: '已关闭'},
+            ], 
           }
         ]
       };
@@ -614,7 +728,6 @@ export default {
       // 绘制图表
       bugPieChart.setOption(option);
     },
-
     drawCostPie() {
       let planTotalCostPie = this.$echarts.init(document.getElementById("planTotalCostPie"));
       let option = {
@@ -623,14 +736,12 @@ export default {
           formatter: '{b} : {c} ({d}%)'
         },
         legend: {
-          orient: 'horizontal',
-          bottom: '80',
-          data: ['非人力', '内部人力', '外购人力'],
-          itemGap: 30,
+          bottom: 10,
+          left: 'center',
         },
         series: [
           {
-            center:['48%','40%'],//饼图位置
+            center:['55%','40%'],//饼图位置
             type: 'pie',
             radius: '50%',//饼图半径大小
             label:{            //饼图图形上的文本标签
@@ -648,64 +759,27 @@ export default {
               }
             },
             data: [
-              {
-                value: this.xmBranchState.budgetNouserAt,
+              {value: this.xmBranch.budgetNouserAt,
                 itemStyle: {
                   normal:{
-                    color: '#46CBF6'
+                    color: '#FAC858'
                   }
                 },
-                name: '非人力',
-                label: {
-                  normal: {
-                    color: '#46CBF6'
-                  },
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.budgetIuserAt,
+                name: '非人力'},
+              {value: this.xmBranch.budgetIuserAt,
                 itemStyle: {
                   normal:{
-                    color: '#F7AE48'
+                    color: '#73C0DE'
                   }
                 },
-                name: '内部人力',
-                label: {
-                  normal: {
-                    color: '#F7AE48'
-                  },
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.budgetOuserAt,
+                name: '内部人力'},
+              {value: this.xmBranch.budgetOuserAt,
                 itemStyle: {
                   normal:{
-                    color: '#4679F6'
+                    color: '#5470C6'
                   }
                 },
-                name: '外购人力',
-                label: {
-                  normal: {
-                    color: '#4679F6'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
+                name: '外购人力'},
             ],
             emphasis: {
               itemStyle: {
@@ -723,112 +797,78 @@ export default {
     },
     drawWorkload() {
       let workloadDistribution = this.$echarts.init(document.getElementById("workloadDistribution"));
-      let that = this;
       let option = {
         tooltip: {
           trigger: 'item',
           formatter: '{b} :<br/> {c} ({d}%)'
         },
         legend: {
-          orient: 'vertical',
-          top: '20',
-          right: '60',
-          data: ['内部人力', '外购人力'],
-          itemGap: 30,
-          textStyle: {
-            rich: {
-              name: {
-                color: '#7D7D7D',
-                fontWeight: 'bold',
-                fontSize: 18
-              },
-              val: {
-                fontSize: '14',
-                color: '#7D7D7D'
-              },
-              desc: {
-                lineHeight: 20,
-                color: '#7D7D7D'
-              }
-            }
-          },
-          formatter(params) {
-            console.log(params);
-            let total = that.xmBranchState.budgetIuserWorkload + that.xmBranchState.budgetOuserWorkload;
-            if(params == '内部人力') {
-              let p = ((that.xmBranchState.budgetIuserWorkload / total) * 100).toFixed(2)
-              return [
-                `{name|${that.xmBranchState.budgetIuserWorkload}}/{val|${p}%}`,
-                `{desc|${params}}`
-              ].join('\n')
-            }
-            if(params == '外购人力') {
-              let p = ((that.xmBranchState.budgetOuserWorkload / total) * 100).toFixed(2)
-              return [
-                `{name|${that.xmBranchState.budgetOuserWorkload}}/{val|${p}%}`,
-                `{desc|${params}}`
-              ].join('\n')
-            }
-            return params;
-          },
-
+          bottom: 10,
+          left: 'center',
         },
+        graphic: {
+          type: 'text',
+          left: 'center',
+          top: '40%',
+          style: {
+          // text: '总数',
+          text:
+            '总工时:'+this.xmBranch.budgetWorkload,
+
+          textAlign: 'center',
+          fill: '#333',
+          width: 30,
+          height: 30,
+          fontSize: 14
+          }
+        }, 
         series: [
           {
-            center:['30%','40%'],//饼图位置
             type: 'pie',
-            radius: ['40%', '70%'],//饼图半径大小
+            center:['50%','40%'],
+            radius: ['35%','60%'],
             label:{            //饼图图形上的文本标签
-              show: false,
-              position: 'center'
+              normal:{
+                show:true,
+                position:'outer', //标签的位置:外部
+                textStyle : {
+                  fontWeight : 100 ,
+                  fontSize: document.body.clientWidth / 120, //标签字体大小
+                  color: "#000000"
+                },
+                formatter:'{b}\n{c}({d}%)',//b：name,c:value,d:占比
+                alignTo:'edge',
+                margin:10
+              }
             },
+            
             data: [
-              {
-                value: this.xmBranchState.budgetIuserWorkload,
+              {value: this.xmBranch.budgetIuserWorkload,
                 itemStyle: {
                   normal:{
-                    color: '#3AC2ED'
-                  }
-                },
-                name: '内部人力',
-                label: {
-                  normal: {
-                    position: "inner",
-                    show: false
+                    color: '#91CC75'
                   }
                 },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.budgetOuserWorkload,
+                name: '内部人力'},
+              {value: this.xmBranch.budgetOuserWorkload,
                 itemStyle: {
                   normal:{
-                    color: '#4072F5'
-                  }
-                },
-                name: '外购人力',
-                label: {
-                  normal: {
-                    position: "inner",
-                    show: false
+                    color: '#3BA272'
                   }
                 },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
+                name: '外购人力'},
             ],
-
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
           }
         ]
       };
+
       // 绘制图表
       workloadDistribution.setOption(option);
     },
@@ -842,78 +882,50 @@ export default {
             type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
           },
         },
-        grid: {
-          left: '1%',
-          right: '3%',
-          bottom: '5%',
-          containLabel: true
-        },
         xAxis: {
-          type: 'value',
-          boundaryGap: [0, 0.01],
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .05)'
-            }
-          },
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .1)'
-            }
-          },
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .1)'
-            }
-          },
-          axisLabel: {
-            color: '#555'
-          }
+          type: 'category',
+          data: ['产品数','项目数', '迭代数']
         },
         yAxis: {
-          type: 'category',
-          data: ['产品数', '迭代数'],
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .05)'
-            }
-          },
-          axisLine: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .1)'
-            }
-          },
-          axisTick: {
-            lineStyle: {
-              color: 'rgba(0, 0, 0, .1)'
-            }
-          },
-          axisLabel: {
-            color: '#555'
-          }
+          type: 'value'
         },
-        series: [{
-          label: {
-            normal:{
-              show: true,
-              position: 'inside',
-              color:'#fff',
-              fontSize: '14'
-            }
-          },
-          data: [this.xmBranchState.productCnt, this.xmBranchState.iterationCnt],
-          type: 'bar',
-          showBackground: true,
-          itemStyle: {
-            normal:{
-              color: '#467AF6'
-            }
-          },
-          backgroundStyle: {
-            color: '#FFFFFF'
-          }
+        series: [{  
+            label: {
+              normal:{
+                show: true,
+                position: 'top',
+                color:'#000000',
+              }
+            },
+          
+          data: [
+            {
+                value: this.xmBranch.productCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#3BA272'
+                  }
+                }
+              },
+            {
+                value: this.xmBranch.projectCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#91CC75'
+                  }
+                }
+              },
+              {
+                value: this.xmBranch.iterationCnt,
+                itemStyle: {
+                  normal:{
+                    color: '#FAC858'
+                  }
+                }
+              },  
+        
+        ],
+          type: 'bar', 
         }]
       };
 
@@ -921,249 +933,178 @@ export default {
       iterationAndProduct.setOption(option);
     },
 
-    searchXmBranchState(callBack){
-      listXmBranchState({branchId:this.userInfo.branchId}).then(res=>{
-        var tips=res.data.tips;
-        if(tips.isOk && res.data.data.length>0){
-          this.xmBranchState=res.data.data[0]
-        }
-        if(callBack){
-          this.$nextTick(()=>{
-            callBack();
-          })
-        }
-      });
-    },
-
-    searchXmBranchFiveDayTaskCnt(callBack){
-      listXmBranchFiveDayTaskCnt({branchId:this.userInfo.branchId}).then(res=>{
-        var tips=res.data.tips;
-        if(tips.isOk && res.data.data.length>0){
-          this.xmBranchFiveDayTaskCnts=res.data.data
-        }
-        if(callBack){
-          this.$nextTick(()=>{
-            callBack();
+    
+    loadTasksToXmBranchState(){
+        var row=this.xmBranch;
+        var params={id:row.id}
+        this.load.calcProject=true;
+      loadTasksToXmBranchState(params).then((res1) => {
+          this.load.calcProject=false; 
+          this.load.list=true;
+          listXmBranchState({id:row.id}).then(res=>{
+            this.load.list=false;
+            var tips = res.data.tips;
+            if(tips.isOk){
+              var xmBranch=res.data.data[0]  
+              if(this.xmBranch && this.xmBranch.id){
+                store.dispatch('setXmBranch',xmBranch)
+              } 
+              Object.assign(this.xmBranch,xmBranch)
+              this.$emit("edit-fields",xmBranch);
+            }
+            this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
           })
-        }
-      });
+          
+        }).catch( err  => this.load.calcProject=false ); 
     },
-
-
-    //路由跳转
-    gotolink(link) {
-      this.$router.replace(link);
+    loadTasksToXmMenuState(){
+        var row=this.xmBranch;
+        var params={productId:row.id}
+      loadTasksToXmMenuState(params).then((res) => {
+          this.load.calcProject=false;
+          var tips=res.data.tips; 
+          this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'});
+        }).catch( err  => this.load.calcProject=false ); 
     },
-
-    /**end 自定义函数请在上面加**/
-    guiderStart(forceDisplayWhileClosed) { // 初始化引导页
-      Guider.startByName('xmHomePage',forceDisplayWhileClosed);
-    },
-    getWeek(dateString) {
-        var dateArray = dateString.split("-");
-        var date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
-        return "周" + "日一二三四五六".charAt(date.getDay());
-    }
   },
 
   mounted() {
-    //this.searchXmBranchState( this.guiderStart );
-    this.searchXmBranchState();
-    this.searchXmBranchFiveDayTaskCnt();
-    this.drawWorkload();
-    this.drawTaskByDate();
-    this.drawAllBar();
-    this.drawCostPie();
-    this.drawPieBug();
-    this.drawIterationProduct();
+    
+    listXmBranchState({id:this.userInfo.branchId}).then(res=>{
+            this.load.list=false;
+            var tips = res.data.tips;
+            if(tips.isOk){
+              this.xmBranch=res.data.data[0]    
+              
+              this.drawAllBar();
+              this.drawMenuPie();
+              this.drawTask();
+              this.drawTestCasePie();
+              this.drawPieBug();
+              this.drawCostPie();
+              this.drawWorkload();
+              this.drawIterationProduct();
+            }
+           })
+    this.$nextTick(() => {
+      this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
+    });
+			
+			initSimpleDicts('all',['xmBranchPstatus']).then(res=>{
+				this.dicts=res.data.data;
+			})
+    
+
   },
 
 };
 </script>
 
 <style scoped lang="scss">
-.page-container {
-  width: 100%;
-  height: 100%;
-  background-color: #F4F5F8;
-  .page-main {
-    padding: 18px;
-    overflow: hidden;
-    h2 {
-      margin-top: 16px;
-      font-size: 24px;
-      color: #7D7D7D;
-    }
-    h2:before {
-      content: " ";
-      border-left: 10px #AEB8CE solid;
-      margin-right: 12px;
-    }
+.container {
+  margin: 10px;
+}
 
-    .row_1 {
-      background-color: #fff;
-      display: flex;
-      flex-direction: row;
-      height: 120px;
-      margin-top: 10px;
-      .r {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        span {
-          margin-bottom: 14px;
-          font-size: 24px;
-          font-weight: bold;
-        }
-        p {
-          font-size: 18px;
-          color: #7D7D7D;
-          font-weight: bold;
-          opacity: 0.55;
-        }
-      }
-    }
+.header {
+  display: flex;
+  justify-content: flex-start;
+  padding: 10px;
 
-    .row_2 {
-      height: 354px;
-      margin-top: 22px;
-      display: flex;
-      flex-direction: row;
-      .r1 {
-        flex: 2;
-        background-color: #fff;
-        margin-right: 20px;
-        .message {
-          display: flex;
-          margin: 0 43px;
-          div {
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            span {
-              margin-bottom: 8px;
-              font-weight: bold;
-              color: #7D7D7D;
-            }
-            p {
-              color: #7D7D7D;
-              opacity: 0.55;
-            }
-          }
-        }
-        .chart {
-          display: flex;
-          flex-direction: row;
-          margin: 0 47px 0 47px;
-          height: 120px;
-          .desc {
-            display: flex;
-            flex-direction: column;
-            margin-right: 20px;
-            font-size: 18px;
-            color: #7D7D7D;
-            justify-content: center;
-            span:nth-child(1) {
-              margin-bottom: 20px;
-            }
-          }
-          .process {
-            display: flex;
-            flex-direction: column;
-            flex: 1;
-            justify-content: center;
-            .pc:nth-child(1) {
-              margin-bottom: 20px;
-            }
-          }
-          .tj {
-            display: flex;
-            flex: 1;
-            justify-content: center;
-            align-items: center;
-          }
-          .chart {
-            flex: 1;
-          }
-        }
-      }
+  span {
+    padding-right: 15px;
+  }
+}
 
-      .r2 {
-        width: 540px;
-        background-color: #fff;
-        .r2 {
-          width: 100%;
-          height: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
+.col {
+  margin-bottom: 20px;
+}
 
-    .row_3 {
-      height: 450px;
-      display: flex;
-      flex-direction: row;
-      margin-top: 24px;
-      .r1 {
-        display: flex;
-        flex: 1;
-        background-color: #fff;
-        flex-direction: column;
-        margin-right: 20px;
-      }
-      .r2 {
-        flex: 1;
-        background-color: #fff;
-        display: flex;
-        flex-direction: column;
-      }
-    }
+.icon {
+  color: #fff;
+  height: 30px; 
+  border-radius: 15px;
+  text-align: center; 
+  font-size: 20px;
+  display: inline-block;
+  margin-right: 5px;
+}
 
-    .row_4 {
-      height: 445px;
-      display: flex;
-      margin-top: 21px;
-      .r4_1 {
-        flex: 1;
-        background-color: #fff;
-        margin-right: 25px;
-        display: flex;
-        flex-direction: column;
-      }
-      .r4_2 {
-        flex: 1;
-        background-color: #fff;
-        margin-right: 25px;
-        display: flex;
-        flex-direction: column;
-      }
-      .r4_3 {
-        display: flex;
-        flex-direction: column;
-        background-color: #fff;
-        flex: 1;
-      }
+.icon2 {
+  color: #000000; 
+  width: 30px;
+  border-radius: 15px;
+  text-align: center; 
+  font-size: 20px;
+  display: inline-block;
+  margin-right: 5px;
+  margin-left: 5px;
+}
 
+.item {
+  display: flex;
+  justify-content: flex-start;
+  position: relative;
+  .progress-item{
+    position:absolute; width:80%;
+  }
+}
+
+.card-font {
+  color: #000000;
+  font-size: 12px;
+
+  .el-col {
+    margin-bottom: 20px;
+  }
+}
+
+.calendar-header {
+  display: flex;
+  justify-content: space-between;
+
+  .cal-header-boxs {
+    flex: 1;
+    display: flex;
+    justify-content: flex-end;
+
+    .cal-header-box {
+      padding: 5px;
+      height: 45px;
+      margin-left: 10px;
     }
 
-    .r_text  {
-      font-size: 20px;
-      color: #7D7D7D;
-      margin: 26px 0 50px 28px;
+    .box-icon {
+      text-align: center;
     }
 
+    .box-info {
+      text-align: center;
+      font-size: 12px;
+      color: #000000;
+    }
   }
+}
 
+.el-tag:hover {
+  cursor: pointer;
+}
 
+.value {
+  cursor: pointer;
+}
 
-
+.reference {
+  margin-top: 10px;
+  font-size: 12px;
 }
 
+.click {
+  background: #e9f7ff;
+}
 
+.calendar-box {
+  display: flex;
+  justify-content: flex-start;
+}
 </style>
+ 
diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index 8d7da9e2..f605bcfe 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -808,7 +808,7 @@ export default {
           style: {
           // text: '总数',
           text:
-            '总工作量h:'+this.xmIteration.budgetWorkload,
+            '总工时:'+this.xmIteration.budgetWorkload,
 
           textAlign: 'center',
           fill: '#333',
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index 3d358631..d7209899 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -813,7 +813,7 @@ export default {
           style: {
           // text: '总数',
           text:
-            '总工作量h:'+this.xmProduct.budgetWorkload,
+            '总工时:'+this.xmProduct.budgetWorkload,
 
           textAlign: 'center',
           fill: '#333',
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 6102c40e..c099fb66 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -825,7 +825,7 @@ export default {
           style: {
           // text: '总数',
           text:
-            '总工作量h:'+this.selProject.budgetWorkload,
+            '总工时:'+this.selProject.budgetWorkload,
 
           textAlign: 'center',
           fill: '#333',