diff --git a/src/router/index.js b/src/router/index.js
index 0992248f..3ee07bcf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -38,7 +38,7 @@ export { Layout }
   }
 **/
 export const constantRouterMap = [
-  { path: '/login', component: _import('login/index2'), hidden: true },
+  { path: '/login', component: _import('login/index'), hidden: true },
   { path: '/404', component: _import('errorPage/404'), hidden: true },
   { path: '/401', component: _import('errorPage/401'), hidden: true },
   {
@@ -49,7 +49,7 @@ export const constantRouterMap = [
     children: [
       {
         path: 'dashboard',
-        component: _import('xm/XmOverview2'),
+        component: _import('xm/XmOverview'),
         name: '首页',
         meta: { title: '首页', icon: 'home-page', noCache: true }
       },
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 88f74b67..0fc0a62b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,511 +1,62 @@
 <template>
-  <div class="login-container">
-    <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm">
-      <div class="title-container">
-        <div class="logo">
-          <img src="../../assets/image/logo1.png" alt="" />  
-          <div class="logo-text"> 
-            <div class="main-title">{{$t('login.title')}}</div> 
-          </div> 
-        </div> 
-        <lang-select class="set-language"></lang-select>
-      </div>
-      <el-form-item prop="authType">  
-          <el-radio-group v-model="loginForm.authType">
-            <el-radio label="password_display_userid">账户密码</el-radio>  
-            <el-radio label="sms">短信验证码快速登录</el-radio> 
-          </el-radio-group>
-      </el-form-item>
-      <el-form-item prop="userloginid" v-show="loginForm.authType=='password_display_userid'"> 
-        <el-input title="登陆账号" name="userloginid" type="text" v-model="loginForm.userloginid" autoComplete="on" placeholder="用户编号" >
-          <template slot="prepend">账号</template>
-        </el-input>  
-      </el-form-item>
-
-      <el-form-item prop="password" v-show="loginForm.authType=='password_display_userid'"> 
-        <el-input name="password" :type="passwordType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="on" placeholder="password">
-          <template slot="prepend">密码</template>
-          <span slot="append" class="show-pwd" @click="showPwd">
-            <svg-icon icon-class="eye" />
-          </span>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="phoneno" v-show="loginForm.authType=='sms'"> 
-        <el-input name="phoneno" type="text" v-model="loginForm.phoneno" autoComplete="on" placeholder="手机号码">
-          <template slot="prepend">手机号码&nbsp;&nbsp;&nbsp;</template>
-          <el-button slot="append" @click.prevent="sendPhonenoSmsCode" v-loading="load.sendSmsCode">发送验证码</el-button>
-        </el-input>
-        
-        <span v-if="users!=null && users.length>0"> 该手机号有{{users.length}}个账户,请选择需要登录的账户<font color="blue"></font>
-        <br>
-         <el-tag v-if="selectUser && selectUser.userid">已选择：{{selectUser.username}}</el-tag> <el-button type="text"  @click="phonenoUsersVisible=true">选择账户</el-button>
-        </span>
-      </el-form-item>
-      <el-form-item prop="smsCode" v-show="loginForm.authType=='sms'"> 
-        <el-input name="smsCode" type="text" v-model="loginForm.smsCode" autoComplete="on" placeholder="短信验证码">
-          <template slot="prepend">短信验证码</template>
-          <template slot="append">六位验证码</template>
-        </el-input>
-      </el-form-item>
-      <el-button type="primary" style="width:100%;margin-bottom:30px;" :loading="loading" @click.native.prevent="handleLogin">{{$t('login.logIn')}}</el-button>
-      <el-row> 
-          <el-button type="success" plain round @click="showRegisterDialog=true">新用户注册</el-button> 
-          <el-button type="warning" plain round @click="showResetPasswordDialog=true">忘记密码</el-button>  
-          <el-button type="primary" plain round @click="showTpLoginDialog=true">{{$t('login.thirdparty')}}</el-button> 
-      </el-row> 
-    </el-form>
-	<el-dialog
-	  title="请选择一个部门进行登陆"
-	  :visible.sync="deptSelectVisible"
-	  width="screenWidth<500?'90%':'500px" append-to-body> 
-	  <el-row class="app-container">
-	  	<el-col :span=20   v-for="(d,index) in myDepts" :key="index">
-		  <el-col :span=20><el-radio v-model="userDeptid" :label="d.deptid">{{d.deptName}}({{d.branchName}})   </el-radio> </el-col> 
-		</el-col> 
-	  </el-row >
-	  <el-row class="app-container" style="text-align:right;">
-		<el-col :span=20 >
-			<el-button @click="deptSelectVisible = false">取 消</el-button>
-   			<el-button type="primary" @click="deptChecked">确 定</el-button>
-   		</el-col>
-	  </el-row >
-	</el-dialog> 
-	
-	<!-- 第三方登陆窗口 -->
-    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showTpLoginDialog" append-to-body>
-      {{$t('login.thirdpartyTips')}}
-      <br/>
-      <br/>
-      <br/>
-      <social-sign />
-    </el-dialog>
-    	<!-- 注册窗口 -->
-    <el-dialog title="新用户注册" :visible.sync="showRegisterDialog" append-to-body>  
-      <register />
-    </el-dialog>
-    	<!-- 重置密码窗口 -->
-    <el-dialog title="重置密码" :visible.sync="showResetPasswordDialog" append-to-body>  
-      <reset-password />
-    </el-dialog>
-	<!--新增 Branch 管理端机构表（机构下面若干部门）界面-->
-	<el-dialog title="新增机构" :visible.sync="addBranchFormVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
-		<branch-add  :visible="addBranchFormVisible" @cancel="addBranchFormVisible=false" @submit="afterAddBranchSubmit"></branch-add>
-	</el-dialog> 
-    
-	<el-dialog
-	  title="查看已有账户"
-	  :visible.sync="phonenoUsersVisible"
-	  width="600" append-to-body> 
-	   <el-table :data="users">
-       <el-table-column prop="userid" label="编号">
-       </el-table-column> 
-       <el-table-column prop="displayUserid" label="登录账号">
-       </el-table-column>
-       <el-table-column prop="username" label="姓名">
-       </el-table-column> 
-       <el-table-column prop="branchName" label="企业">
-       </el-table-column>
-       <el-table-column label="操作">
-         <template slot-scope="scope">
-         <el-button type="primary" @click="onUserSelect(scope.row)">选中</el-button>
-         </template>
-       </el-table-column>
-     </el-table>
-	</el-dialog> 
-  </div>
+    <div class="login_container">
+        <div class="login_content">
+            <div class="left">
+            </div>
+            <div class="right">
+                <div class="logo">
+                    <img src="@/assets/image/logo1.png">
+                    <span>唛盟</span>
+                </div>
+                <div class="login_box">
+                    <div class="login_box_content">
+                        <div class="top">
+                            <h2>平台{{status == 'register' ? '注册' : '登录' }}</h2>
+                            <span v-if="status == 'login'" >没有账号？<a style="color:#409EFF;" @click="status = 'register' ">点此注册</a> </span>
+                            <span v-else>已有账号？<a style="color:#409EFF;" @click="status = 'login' ">点此登录</a> </span>
+                        </div>
+                        <login-form v-if="status == 'login'"></login-form>
+                        <register-form v-else></register-form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </template>
 
-<script> 
-import { sendSmsCode } from '@/api/sms/sms';
-import LangSelect from '@/components/LangSelect';
-import SocialSign from './socialsignin';
-import Register from './register';
-import ResetPassword from './resetPassword';
-import { queryByUserloginid } from '@/api/login';
-
-import BranchAdd from './BranchAdd';
-import { mapGetters } from 'vuex'; 
-import md5 from 'js-md5';
+<script>
+import loginForm from './components/login';
+import registerForm from './components/register';
 
 export default {
-  components: { LangSelect, SocialSign, BranchAdd, Register,ResetPassword},
-  name: 'login',
-  data() {
-    const validateDisplayUserid = (rule, value, callback) => {
-      if (this.loginForm.authType=='password_display_userid') {
-        if(value.length<=6){
-          callback(new Error('请输入6位以上用户账号'))
-        }else{
-          callback()
-        } 
-      } else {
-        callback()
-      }
-    }
-    const validatePassword = (rule, value, callback) => {
-      if (this.loginForm.authType=='password_display_userid') {
-        if(value.length<6){
-          callback(new Error('密码最少为六位'))
-        }else{
-          callback()
-        } 
-      } else {
-        callback()
-      } 
-    }
-    const validatePhoneno = (rule, value, callback) => {
-      if (this.loginForm.authType=='sms') {
-        if(value.length !=11 ){
-          callback(new Error('手机号码必须为11位号码'))
-        }else{
-          callback()
-        } 
-      } else {
-        callback()
-      }  
-    }
-    const validateSmsCode = (rule, value, callback) => {
-      if (this.loginForm.authType=='sms') {
-        if(value.length !=6 ){
-          callback(new Error('请输入6位短信验证码'))
-        }else{
-          callback()
-        } 
-      } else {
-        callback()
-      } 
-    }
-    return {
-      loginForm: {
-        userloginid: '',
-        password: '',
-        authType:'password_display_userid',//password/sms/password_display_userid 分别为账户密码、短信验证码快捷登录
-        phoneno:'',//手机号码
-        smsCode:'',//短信验证码
-      },
-      loginRules: {
-        userloginid: [{ required: true, trigger: 'blur', validator: validateDisplayUserid }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }],
-        phoneno: [{ required: true, trigger: 'blur', validator: validatePhoneno }],
-        smsCode: [{ required: true, trigger: 'blur', validator: validateSmsCode }],
-      }, 
-      passwordType: 'password',
-      
-      loading: false,
-      load:{sendSmsCode:false,},
-      showResetPasswordDialog:false,//显示忘记密码重置密码窗口
-      showTpLoginDialog: false, //显示第三方登陆对话框
-      showRegisterDialog: false,//显示注册窗口
-	    deptSelectVisible:false,//显示选择部门对话框
-	    userDeptid:'',//选中的部门编号 
-	    addBranchFormVisible:false,  //显示添加机构对话框 
-      users:[],
-      phonenoUsersVisible:false,
-      selectUser:null,
-    }
-  },
-  methods: {
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-    },
-    sendPhonenoSmsCode(){
-      this.load.sendSmsCode=true;
-      this.$refs.loginForm.validateField("phoneno",(err)=>{
-        if(err){
-          this.$message.error(err);
-          this.load.sendSmsCode=false;
-          return;
-        }else{
-          var params={
-            phoneno:this.loginForm.phoneno,
-            scene:"login"
-          }
-
-          sendSmsCode(params).then(res=>{ 
-            this.load.sendSmsCode=false;
-            if(res.data.tips.isOk){
-              this.$message.success(res.data.tips.msg);
-              this.queryByUserloginid();
-            }else{
-              this.$message.error(res.data.tips.msg);
-            }
-          }).catch(()=>this.load.sendSmsCode=false)
+    name: 'login',
+    components: {loginForm, registerForm},
+    data() {
+        return {
+            status: "login",
         }
-      });
-      
     },
-    handleLogin() {
-
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          let params={
-        		  userloginid:this.loginForm.userloginid,
-              password:md5(this.loginForm.password),
-              deptid:this.userDeptid,
-              authType:this.loginForm.authType,
-              phoneno:this.loginForm.phoneno,
-              smsCode:this.loginForm.smsCode
-          }
-          var loginParams={ }
-          if(params.authType=='password_display_userid'){
-            loginParams.userloginid=params.userloginid
-            loginParams.password=params.password
-            loginParams.grantType="password"
-            loginParams.authType='password_display_userid' 
-            loginParams.deptid=params.deptid
-          }else if(params.authType=='sms'){
-            loginParams.userloginid=params.phoneno
-            loginParams.password=params.smsCode
-            loginParams.grantType="password"
-            loginParams.authType="sms"
-            loginParams.deptid=params.deptid
-          }
-          if(this.selectUser){
-            loginParams.userid=this.selectUser.userid
-          }
-          this.$store.dispatch("LoginByUserloginid",loginParams).then(res => {
-        	  this.loading = false
-            debugger;
-            if(res.data.tips.isOk==true){
-            	console.log(this.$store);
-            	 this.loading = true;
-                this.$store.dispatch('GetUserInfo').then((res2)=>{
-                	//this.userDeptid=res2.data.userInfo.deptid
-                  debugger;
-                	this.loading = false
-                	if(res2.data.tips.isOk==true){
-                		    if(this.$store.state.user.myDepts.length>1 ){
-                        	//this.$message.info("亲，您在多个部门中任职，我分不清您要登陆哪个部门，请选择一个部门登陆吧"); 
-                          if( !this.userDeptid ){
-                            this.userDeptid=res2.data.userInfo.deptid 
-                            this.deptSelectVisible=true; 
-                          }else{
-                        	  this.rolesChecked();
-                          }
-                        	//this.$router.push({ path: 'mdp/sys/branch/BranchAdd' })
-                        }else if(this.$store.state.user.myDepts.length==1){
-                        	//进行角色身份验证
-                          this.userDeptid=res2.data.userInfo.deptid
-                        	this.rolesChecked();
-                        }else{
-                          this.rolesChecked();
 
-                        }
-                	}else{
-                		this.$message.error(res2.data.tips.msg);
-                	}
-                	
-                }).catch(err=>{
-                	console.log(err); 
-                	this.loading = false
-                }); 
-            }else{
-            	this.$message.error(res.data.tips.msg);
-            } 
-          }).catch((e) => {
-        	  console.log(e);
-            this.loading = false
-          })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
+    methods: {
     },
-    deptChecked() {
-    	if( !this.userDeptid){
-    		this.$message.error("请选择登陆的部门")
-    		return
-    	}
-    	
-    	let depts=this.myDepts.filter(d=>d.deptid==this.userDeptid)   
-    	if(this.$store.state.user.userInfo.deptid!=this.userDeptid){
-        	this.handleLogin();
-          return;
-    	}else{
-    		this.rolesChecked();
-    	}
 
+
+    created() {
     },
-    //角色身份验证
-    rolesChecked(){ 
-    	if(this.userInfo.isSuperAdmin){ 
-    			this.$router.push({ path: '/' });
-    			this.$message.info("欢迎登陆，超级管理员"); 
-	  	}else if(this.userInfo.isPlatformAdmin){ 
-			this.$router.push({ path: '/' });
-			this.$message.info("欢迎登陆，平台管理员"); 
-  		}else{
-  			this.$router.push({ path: '/' }); 
-  			this.$message.info("欢迎登陆"); 
-	  	}
-    },   
-    
-    afterAddBranchSubmit(branch){
-    	this.addBranchFormVisible=false;
-      this.handleLogin();
-    },
-    afterQRScan() {
-      // const hash = window.location.hash.slice(1)
-      // const hashObj = getQueryObject(hash)
-      // const originUrl = window.location.origin
-      // history.replaceState({}, '', originUrl)
-      // const codeMap = {
-      //   wechat: 'code',
-      //   tencent: 'code'
-      // }
-      // const codeName = hashObj[codeMap[this.auth_type]]
-      // if (!codeName) {
-      //   alert('第三方登录失败')
-      // } else {
-      //   this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
-      //     this.$router.push({ path: '/' })
-      //   })
-      // }
-    },
-    queryByUserloginid(){
-      var params={userloginid:this.loginForm.userloginid}
-      if(this.loginForm.authType=='sms'){
-        params.idType="phoneno"
-      }else{
-        params.idType='all'
-      }
-      queryByUserloginid(params).then(res=>{
-        var tips = res.data.tips;
-        if(tips.isOk){
-          this.users=res.data.data
-        }
-      })
+    destroyed() {
     },
-    onUserSelect(user){
-      this.selectUser=user
-      this.phonenoUsersVisible=false; 
-    }
-  },
-  created() {
-    // window.addEventListener('hashchange', this.afterQRScan)
-  },
-  destroyed() {
-    // window.removeEventListener('hashchange', this.afterQRScan)
-  },
-  computed: {
-    ...mapGetters([
-      'myBranchs','myDepts','userInfo','roles'
-    ]),
-    
-			screenWidth:function(){
-				return screen.width;
-			},
-  }
+
 }
+
+
+
+
+
 </script>
- 
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#ef1010;
+<style lang="scss" scoped>
+@import './index.scss';
+</style>
+
+
 
-.login-container { 
-  position:absolute;
-  height: 100%;
-  width: 100%;
-  background-color: $bg;
-  background-size: 100%;
-  background:url(../../assets/image/yxin_login_backgroup_pc.png) center center;
-  .login-form {
-    position: absolute;
-    left: 0;
-    right: 0;
-    max-width: 520px;
-    padding: 35px 35px 15px 35px;
-    margin: 180px auto;
-    border-radius: 20px; 
-  	background-color:#f5f7faee;
-  }
-  .tips {
-    font-size: 14px;
-    color: #fff;
-    margin-bottom: 10px;
-    span {
-      &:first-of-type {
-        margin-right: 16px;
-      }
-    }
-  }
-  .svg-container {
-    padding: 6px 5px 6px 15px;
-    color: $dark_gray;
-    vertical-align: middle;
-    width: 30px;
-    display: inline-block;
-    &_login {
-      font-size: 20px;
-    }
-  }
-  .title-container {
-    position: relative;
-    .title {
-      font-size: 26px;
-      font-weight: 400;
-      color: $light_gray;
-      margin: 0px auto 40px auto;
-      text-align: center;
-      font-weight: bold;
-    }
-    .set-language {
-      color: rgb(95, 41, 221);
-      position: absolute;
-      top: 5px;
-      right: 0px;
-    }
-  }
-  .show-pwd {
-    position: absolute;
-    right: 10px;
-    top: 7px;
-    font-size: 16px;
-    color: $dark_gray;
-    cursor: pointer;
-    user-select: none;
-  }
-  .thirdparty-button {
-    position: absolute;
-    right: 35px;
-    bottom: 28px;
-  }
-  .register-button {
-    position: absolute; 
-    bottom: 28px;
-  }
-}
-.logo {
-  height: 100px;
-  width: 100%;
-  // padding: 0 20px;
-  display: flex;
-  align-items: left;
-  justify-content: center;
-  img {
-    height: 100%;
-  }
-  .logo-text {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: $light_gray; 
-    .main-title {
-      font-size: 35px;
-      font-weight: 400;
-      color: $light_gray; 
-      text-align: center;
-      font-weight: bold;
-    } 
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/login/index2.vue b/src/views/login/index2.vue
deleted file mode 100644
index 0fc0a62b..00000000
--- a/src/views/login/index2.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-    <div class="login_container">
-        <div class="login_content">
-            <div class="left">
-            </div>
-            <div class="right">
-                <div class="logo">
-                    <img src="@/assets/image/logo1.png">
-                    <span>唛盟</span>
-                </div>
-                <div class="login_box">
-                    <div class="login_box_content">
-                        <div class="top">
-                            <h2>平台{{status == 'register' ? '注册' : '登录' }}</h2>
-                            <span v-if="status == 'login'" >没有账号？<a style="color:#409EFF;" @click="status = 'register' ">点此注册</a> </span>
-                            <span v-else>已有账号？<a style="color:#409EFF;" @click="status = 'login' ">点此登录</a> </span>
-                        </div>
-                        <login-form v-if="status == 'login'"></login-form>
-                        <register-form v-else></register-form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import loginForm from './components/login';
-import registerForm from './components/register';
-
-export default {
-    name: 'login',
-    components: {loginForm, registerForm},
-    data() {
-        return {
-            status: "login",
-        }
-    },
-
-    methods: {
-    },
-
-
-    created() {
-    },
-    destroyed() {
-    },
-
-}
-
-
-
-
-
-</script>
-
-<style lang="scss" scoped>
-@import './index.scss';
-</style>
-
-
-
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
deleted file mode 100644
index fb879e04..00000000
--- a/src/views/login/register.vue
+++ /dev/null
@@ -1,378 +0,0 @@
-<template>
-  <div>
-    <el-form  autoComplete="on" label-width="120px" :model="loginForm" :rules="loginRules" ref="loginForm"> 
-      <div>
-        <div class="logo">
-          <img src="../../assets/image/logo1.png" alt="" />  
-          <div class="logo-text"> 
-            <div class="systemName">{{$t('login.title')}}</div> 
-          </div> 
-        </div>  
-      </div>  
-      <el-form-item prop="phoneno" label="手机号码"> 
-        <el-input name="phoneno" type="text" v-model="loginForm.phoneno" autoComplete="on" placeholder="手机号码"> 
-         <span slot="append"> <el-button  @click.prevent="sendPhonenoSmsCode" v-loading="load.sendSmsCode">发送验证码</el-button> </span>
-        </el-input>
-        <span v-if="phonenoUsers!=null && phonenoUsers.length>0"> 该手机号已注册有{{phonenoUsers.length}}个账户<font color="blue"></font>
-          <el-button type="text"  @click="phonenoUsersVisible=true">查看明细</el-button>
-        </span>
-      </el-form-item>
-      <el-form-item prop="smsCode"  label="短信验证码"> 
-        <el-input name="smsCode" type="text" v-model="loginForm.smsCode" autoComplete="on" placeholder="短信验证码">
-           <template slot="append">六位验证码</template>
-        </el-input>
-      </el-form-item> 
-      <el-form-item prop="username"  label="用户名称"> 
-        <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="用户名称" >
-         </el-input>
-      </el-form-item>
-      <el-form-item prop="displayUserid"  label="账号"> 
-        <el-input name="displayUserid" type="text" v-model="loginForm.displayUserid" autoComplete="on" placeholder="用户编号" >
-           <el-button slot="append" @click.prevent="checkDisplayUserid">检测是否已注册</el-button> 
-        </el-input>
-      </el-form-item>
-
-      <el-form-item prop="password"  label="密码"> 
-        <el-input name="password" :type="passwordType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="on" placeholder="password">
-           <span slot="append" class="show-pwd" @click="showPwd">
-            <svg-icon icon-class="eye" />
-          </span>
-        </el-input>
-      </el-form-item>
-      <el-button type="primary" style="width:100%;margin-bottom:30px;" :loading="loading" @click.native.prevent="handleRegister">注册</el-button> 
-    </el-form>
-	<el-dialog
-	  title="请选择一个部门进行登陆"
-	  :visible.sync="deptSelectVisible"
-	  width="screenWidth<500?'90%':'500px" append-to-body> 
-	  <el-row class="app-container">
-	  	<el-col :span=20   v-for="(d,index) in myDepts" :key="index">
-		  <el-col :span=20><el-radio v-model="userDeptid" :label="d.deptid">{{d.deptName}}({{d.branchName}})   </el-radio> </el-col> 
-		</el-col> 
-	  </el-row >
-	  <el-row class="app-container" style="text-align:right;">
-		<el-col :span=20 >
-			<el-button @click="deptSelectVisible = false">取 消</el-button>
-   			<el-button type="primary" @click="deptChecked">确 定</el-button>
-   		</el-col>
-	  </el-row >
-	</el-dialog> 
-	<el-dialog
-	  title="查看已有账户"
-	  :visible.sync="phonenoUsersVisible"
-	  width="600" append-to-body> 
-	   <el-table :data="phonenoUsers">
-       <el-table-column prop="userid" label="编号">
-       </el-table-column> 
-       <el-table-column prop="displayUserid" label="登录账号">
-       </el-table-column>
-       <el-table-column prop="username" label="姓名">
-       </el-table-column>
-       
-       <el-table-column prop="branchName" label="企业">
-       </el-table-column>
-     </el-table>
-	</el-dialog> 
-	<!-- 第三方登陆窗口 -->
-    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showTpLoginDialog" append-to-body>
-      {{$t('login.thirdpartyTips')}}
-      <br/>
-      <br/>
-      <br/>
-      <social-sign />
-    </el-dialog>
-    
-	<!--新增 Branch 管理端机构表（机构下面若干部门）界面-->
-	<el-dialog title="新增机构" :visible.sync="addBranchFormVisible"  width="50%"  :close-on-click-modal="false" append-to-body>
-		<branch-add  :visible="addBranchFormVisible" @cancel="addBranchFormVisible=false" @submit="afterAddBranchSubmit"></branch-add>
-	</el-dialog> 
-  </div>
-</template>
-
-<script> 
-import { sendSmsCode } from '@/api/sms/sms';
-import { checkPhoneno,checkDisplayUserid,doRegister,queryByUserloginid } from '@/api/login';
-
-import LangSelect from '@/components/LangSelect';
-import SocialSign from './socialsignin';
-import BranchAdd from './BranchAdd';
-import { mapGetters } from 'vuex'; 
-import md5 from 'js-md5';
-
-export default {
-  components: { LangSelect, SocialSign, BranchAdd },
-  name: 'login',
-  data() {
-    const validateDisplayUserid = (rule, value, callback) => { 
-        if( !value || value.length<=6){
-          callback(new Error('请输入6位以上用户账号'))
-        }else{
-          callback()
-        }  
-    }
-    const validatePassword = (rule, value, callback) => { 
-        if( !value || value.length<6){
-          callback(new Error('密码最少为六位'))
-        }else{
-          callback()
-        }  
-    }
-    const validatePhoneno = (rule, value, callback) => { 
-        if( !value || value.length !=11 ){
-          callback(new Error('手机号码必须为11位号码'))
-        }else{
-          callback()
-        }  
-    }
-    const validateSmsCode = (rule, value, callback) => { 
-        if( !value || value.length !=6 ){
-          callback(new Error('请输入6位短信验证码'))
-        }else{
-          callback()
-        }  
-    }
-    const validateUsername = (rule, value, callback) => { 
-        if( !value || value.length <2 ){
-          callback(new Error('请输入用户名称'))
-        }else{
-          callback()
-        }  
-    }
-    return {
-      loginForm: {
-        username:'', 
-        displayUserid: '',
-        password: '',
-        authType:'password_display_userid',//password/sms/password_display_userid 分别为账户密码、短信验证码快捷登录
-        phoneno:'',//手机号码
-        smsCode:'',//短信验证码
-      },
-      loginRules: {
-        
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        displayUserid: [{ required: true, trigger: 'blur', validator: validateDisplayUserid }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }],
-        phoneno: [{ required: true, trigger: 'blur', validator: validatePhoneno }],
-        smsCode: [{ required: true, trigger: 'blur', validator: validateSmsCode }],
-      }, 
-      passwordType: 'password',
-      
-      loading: false,
-      load:{sendSmsCode:false,},
-      showTpLoginDialog: false, //显示第三方登陆对话框
-      deptSelectVisible:false,//显示选择部门对话框
-      userDeptid:'',//选中的部门编号 
-      addBranchFormVisible:false,  //显示添加机构对话框 
-      phonenoUsers:[],//与手机号关联的账户
-      phonenoUsersVisible:false,
-    }
-  },
-  methods: {
-    showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
-      } else {
-        this.passwordType = 'password'
-      }
-    },
-    sendPhonenoSmsCode(){
-      this.load.sendSmsCode=true;
-      if(!this.loginForm.phoneno){
-        this.$message.error("手机号码不能为空"); 
-        this.load.sendSmsCode=false;
-        return;
-      }
-      if(this.loginForm.phoneno.length !=11 ){
-        this.$message.error("手机号码必须为11位");
-        this.load.sendSmsCode=false;
-        return;
-      }
-      var params={
-        phoneno:this.loginForm.phoneno,
-        scene:"register"
-      }  
-       queryByUserloginid({userloginid:this.loginForm.phoneno,idType:"phoneno"}).then(res0=>{ 
-        this.load.sendSmsCode=false;
-        if(res0.data.tips.isOk){ 
-          this.phonenoUsers=res0.data.data; 
-          sendSmsCode(params).then(res=>{
-            if(res.data.tips.isOk){
-              this.$message.success(res.data.tips.msg);
-            }else{
-              this.$message.error(res.data.tips.msg);
-            }
-          })
-        } 
-      }).catch(err=> this.load.sendSmsCode=false)
-      /**
-      checkPhoneno(this.loginForm.phoneno).then(res0=>{
-        if(res0.data.tips.isOk){
-          sendSmsCode(params).then(res=>{
-            if(res.data.tips.isOk){
-              this.$message.success(res.data.tips.msg);
-            }else{
-              this.$message.error(res.data.tips.msg);
-            }
-          })
-        }else{
-          this.$message.error("手机号码已存在，不允许注册，请直接登录");
-        }
-      })
-       */
-      
-    },
-    checkPhonenoUsers(){ 
-       queryByUserloginid({userloginid:this.loginForm.phoneno,idType:"phoneno",atype:'1'}).then(res0=>{
-        if(res0.data.tips.isOk){ 
-          this.phonenoUsers=res0.data.data; 
-        } 
-      })
-    },
-    checkDisplayUserid(){
-      if(!this.loginForm.displayUserid){
-        this.$message.error("账号不能为空");
-        return;
-      }
-      checkDisplayUserid(this.loginForm.displayUserid).then(res0=>{
-        if(res0.data.tips.isOk){
-           this.$message.success("该账户可以注册");
-        }else{
-          this.$message.error("该账户已存在，不允许再注册！");
-        }
-      })
-      
-    },
-    
-    handleRegister() {
-      this.loading = true 
-      this.$refs.loginForm.validate(valid => {
-        if (valid) { 
-          let params={
-        		  displayUserid:this.loginForm.displayUserid,
-              password:md5(this.loginForm.password),
-              deptid:this.userDeptid,
-              phoneno:this.loginForm.phoneno,
-              smsCode:this.loginForm.smsCode,
-              username:this.loginForm.username,
-          } 
-          doRegister(params).then(res=>{
-            this.loading = false  
-            if(res.data.tips.isOk){
-              this.$message.success(res.data.tips.msg);
-            }else{
-              this.$message.error(res.data.tips.msg);
-            }
-          })
-        } else {
-            this.loading = false  
-           return false
-        }
-      })
-    },
-    deptChecked() {
-    	if( !this.userDeptid){
-    		this.$message.error("请选择登陆的部门")
-    		return
-    	}
-    	
-    	let depts=this.myDepts.filter(d=>d.deptid==this.userDeptid)   
-    	if(this.$store.state.user.userInfo.deptid!=this.userDeptid){
-        	this.handleLogin();
-          return;
-    	}else{
-    		this.rolesChecked();
-    	}
-
-    },
-    //角色身份验证
-    rolesChecked(){ 
-    	if(this.userInfo.isSuperAdmin){ 
-    			this.$router.push({ path: '/' });
-    			this.$message.info("欢迎登陆，超级管理员"); 
-	  	}else if(this.userInfo.isPlatformAdmin){ 
-			this.$router.push({ path: '/' });
-			this.$message.info("欢迎登陆，平台管理员"); 
-  		}else{
-  			this.$router.push({ path: '/' }); 
-  			this.$message.info("欢迎登陆"); 
-	  	}
-    },   
-    
-    afterAddBranchSubmit(branch){
-    	this.addBranchFormVisible=false;
-    	this.loading=true
-        this.$store.dispatch('GetUserInfo').then((res)=>{
-        	this.userDeptid=res.data.userInfo.deptid 
-        	this.loading = false;
-        	//角色身份验证
-    		this.rolesChecked();
-        }); 
-    },
-    afterQRScan() {
-      // const hash = window.location.hash.slice(1)
-      // const hashObj = getQueryObject(hash)
-      // const originUrl = window.location.origin
-      // history.replaceState({}, '', originUrl)
-      // const codeMap = {
-      //   wechat: 'code',
-      //   tencent: 'code'
-      // }
-      // const codeName = hashObj[codeMap[this.auth_type]]
-      // if (!codeName) {
-      //   alert('第三方登录失败')
-      // } else {
-      //   this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
-      //     this.$router.push({ path: '/' })
-      //   })
-      // }
-    }
-  },
-  created() {
-    // window.addEventListener('hashchange', this.afterQRScan)
-  },
-  destroyed() {
-    // window.removeEventListener('hashchange', this.afterQRScan)
-  },
-  computed: {
-    ...mapGetters([
-      'myBranchs','myDepts','userInfo','roles'
-    ]),
-    
-			screenWidth:function(){
-				return screen.width;
-			},
-  }
-}
-</script>
- 
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#ef1010;
- 
-.logo {
-  height: 100px;
-  width: 100%;
-  // padding: 0 20px;
-  display: flex;
-  align-items: left;
-  justify-content: center;
-  img {
-    height: 100%;
-  }
-  .logo-text {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: $light_gray; 
-    .systemName {
-      font-size: 35px;
-      font-weight: 400;
-      color: $light_gray; 
-      text-align: center;
-      font-weight: bold;
-    } 
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/xm/XmOverview.vue b/src/views/xm/XmOverview.vue
index 6776fd97..c714272d 100644
--- a/src/views/xm/XmOverview.vue
+++ b/src/views/xm/XmOverview.vue
@@ -1,355 +1,154 @@
 <template>
-  <section class="page-container padding">
-    <el-row class="page-main " :style="{overflowX: 'hidden',height:maxTableHeight+'px'}" ref="table"> 
-      <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 class="el-icon-s-data" style=" color: #3E68fe;">数据汇总</span>
-              </div>
-              <el-row style="margin-bottom:18px">
-                <el-col :span="8">
-                  <div class="item">
-                    <div class="icon" style="background-color:  rgb(79, 140, 255);">
-                      <i class="el-icon-alarm-clock"></i>
-                    </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.totalPlanWorkload"></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-alarm-clock"></i>
-                    </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.productBudgetWorkload">
-                      </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-s-custom"></i>
-                    </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.totalStaffCnt" >
-                      </div>
-                      <div class="title">总人数</div>
-                    </div>
-                  </div>
-                </el-col>
-              </el-row>
-              <el-row style="margin-bottom:18px">
-                <el-col :span="8">
-                  <div class="item">
-                    <div class="icon" style="background-color:  rgb(79, 140, 255);">
-                      <i class="el-icon-s-unfold"></i>
-                    </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.projectCnt"></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-date"></i>
-                    </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.totalPhaseCnt">
-                      </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-s-operation"></i>
-                    </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.totalTaskCnt" >
-                      </div>
-                      <div class="title">任务数</div>
-                    </div>
-                  </div>
-                </el-col>
-              </el-row> 
-              <el-row style="margin-bottom:18px">
-                <el-col :span="8">
-                <div class="item">
-                  <div class="icon" style="background-color:  rgb(79, 140, 255);">
-                    <i class="el-icon-star-off"></i>
-                  </div>
-                    <div class="info">
-                      <div v-text="xmBranchState.productCnt" >
-                      </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-refresh"></i>
-                  </div> 
-                    <div class="info">
-                      <div v-text="xmBranchState.iterationCnt" >
-                      </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-loading"></i>
-                  </div> 
-                    <div class="info">
-                      <div v-text="xmBranchState.menuCnt" >
-                      </div>
-                      <div class="title">需求数</div>
-                    </div> 
-                </div>
-                
-                </el-col>
-              </el-row>
-            </el-card>
-          </el-col>
-          <el-col :span="8" >
-          <el-card class="box-card" style="height:425px">
-            <div slot="header" class="clearfix">
-              <span class="el-icon-document" style=" color: #3E68fe;">&nbsp;快捷菜单</span>
-            </div> 
-            <div class="menu"> 
-              <div class="menu-content"> 
-                <div class="quick-menu" @click="gotolink('/xm/core/xmProduct/XmProductAllMng')" id="XmProductAllMng">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-attendance.png" />
-                  </div>
-                  <div class="quick-menu-text">产品管理</div>
-                </div>  
-                <div class="quick-menu" @click="gotolink('/xm/core/xmMenu/XmMenuMng')" id="XmMenuMng">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-contract.png" />
-                  </div>
-                  <div class="quick-menu-text">需求管理</div>
-                </div>  
-                <div class="quick-menu" @click="gotolink('/xm/core/xmProject/XmProjectAllMng')" id="XmProjectAllMng">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-project.png" />
-                  </div>
-                  <div class="quick-menu-text">项目管理</div>
-                </div>  
-                <div class="quick-menu" @click="gotolink('/xm/core/xmTask/XmMyTaskCenter')" id="XmMyTaskCenter">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-code.png" />
-                  </div>
-                  <div class="quick-menu-text">开发任务</div>
-                </div>  
-                <div class="quick-menu" @click="gotolink('/xm/core/xmGroup/XmGroupAllMng')" id="XmGroupAllMng">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-organization.png" />
-                  </div>
-                  <div class="quick-menu-text">团队管理</div>
-                </div>  
-                <div class="quick-menu" @click="gotolink('/xm/core/xmQuestion/XmQuestionMng')" id="XmQuestionMng">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-fake.png" />
-                  </div>
-                  <div class="quick-menu-text">缺陷管理</div>
-                </div> 
-                <div class="quick-menu" @click="gotolink('/mdp/workflow/ru/task/TaskListAssigneeToMe')" id="TaskListAssigneeToMe">
-                  <div class="quick-menu-icon-outer">
-                    <img src="../../assets/image/platform/module-task.png" />
-                  </div>
-                  <div class="quick-menu-text">待审事项</div>
-                </div> 
-              </div>
+  <section class="page-container">
+    <div class="page-main">
+      <div class="row_1">
+        <div class="r r1">
+          <span style="color: #4779F6">{{xmBranchState.projectCnt || 0}}</span>
+          <p>项目数</p>
+        </div>
+        <div class="r r2">
+          <span style="color: #4779F6">{{xmBranchState.budgetWorkload || 0}}</span>
+          <p>项目总工时</p>
+        </div>
+        <div class="r r3">
+          <span style="color: #F6AE47">{{xmBranchState.productCnt || 0}}</span>
+          <p>产品数</p>
+        </div>
+        <div class="r r4">
+          <span style="color: #F6AE47">{{xmBranchState.productBudgetWorkload || 0}}</span>
+          <p>产品总工时</p>
+        </div>
+        <div class="r r5">
+          <span style="color: #47CBF6">{{xmBranchState.phaseCnt || 0}}</span>
+          <p>计划数</p>
+        </div>
+        <div class="r r6">
+          <span style="color: #47CBF6">{{xmBranchState.iterationCnt || 0}}</span>
+          <p>迭代数</p>
+        </div>
+        <div class="r r7">
+          <span style="color: #F68D47">{{xmBranchState.planWorkerCnt || 0}}</span>
+          <p>总人数</p>
+        </div>
+        <div class="r r8">
+          <span style="color: #7D7D7D">{{xmBranchState.taskCnt || 0}}</span>
+          <p>任务数</p>
+        </div>
+        <div class="r r9">
+          <span style="color: #7D7D7D">{{xmBranchState.menuCnt || 0}}</span>
+          <p>需求数</p>
+        </div>
+      </div>
+
+      <div class="row_2">
+        <div class="r1">
+          <p class="r_text">项目进度</p>
+          <div class="message">
+            <div>
+              <span>{{this.xmBranchState.estimateWorkload || 0}}h</span>
+              <p>预估工时</p>
             </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 class="el-icon-s-operation" style=" color: #3E68fe;">项目进度</span>
-              </div>
-              <div>
-                <el-row style="padding-top:15px;padding-left:25px;">
-                  <div class="item">
-                    <el-col :span="8">
-                      <div>
-                        <div style="text-align:center;">
-                          <span style="font-size:24px;" v-text="this.xmBranchState.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.xmBranchState.totalActWorkload"></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="workloadProgress"></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 style="padding-top:15px;padding-left:25px;">
-                  <div class="item">
-                    <el-col :span="8">
-                      <div>
-                        <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>
-                        <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>
-                        <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;">项目预计进度</span>
-                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;" :text-inside="true" :stroke-width="24" :percentage="planProgress"></el-progress>
-                </el-row>
-                <el-row>
-                  <span style="margin-left:20px;">项目实际进度</span>
-                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;" :text-inside="true" :stroke-width="24" :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 class="el-icon-document"  style=" color: #3E68fe;">工作量分布</span>
-              </div>
-              <div>
-                <div id="workloadDistribution" :style="{width: '100%', height: '410px'}"></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 class="el-icon-document"  style=" color: #3E68fe;">任务每日状态趋势</span>
-              </div>
-              <div>
-                <div id="taskChart" :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  class="el-icon-document"  style=" color: #3E68fe;">工作项数量分布</span>
-              </div>
-              <div>
-                <div id="allChart" :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  class="el-icon-document"  style=" color: #3E68fe;">总预算情况</span>
+            <div>
+              <span>{{this.xmBranchState.actWorkload || 0}}h</span>
+              <p>登记工时</p>
+            </div>
+            <div>
+              <span>{{workloadProgress || 0}}%</span>
+              <p>工时进度</p>
             </div>
             <div>
-              <div id="planTotalCostPie" :style="{width: '100%', height: '410px'}"></div>
+              <span>{{remainWorkload || 0}}h</span>
+              <p>剩余工时</p>
             </div>
-          </el-card>
-        </el-col> 
-          <el-col :span="8" >
-            <el-card class="box-card" style="height:425px">
-              <div slot="header" class="clearfix">
-                <span  class="el-icon-document"  style=" color: #3E68fe;">缺陷情况</span>
-              </div>
-              <div>
-                <div id="bugPieChart" :style="{width: '100%', height: '410px'}"></div>
-              </div>
-            </el-card>
-          </el-col>
-        <el-col :span="8" >
-          <el-card class="box-card" style="height:425px">
-            <div slot="header" class="clearfix">
-              <span  class="el-icon-document"  style=" color: #3E68fe;">所含产品和迭代情况</span>
+            <div>
+              <span>{{deviation || 0}}h</span>
+              <p>预估偏差</p>
             </div>
             <div>
-              <div id="iterationAndProduct" :style="{width: '100%', height: '350px'}"></div>
+              <span>{{deviationRate || 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>
-          </el-card>
-        </el-col>
-      </el-row>
-    </el-row>
+            <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>
+
+        <div class="r2">
+          <p class="r_text">工作量分布</p>
+          <div class="chart">
+            <div id="workloadDistribution" :style="{width: '100%', height: '250px'}"></div>
+          </div>
+        </div>
+      </div>
+
+      <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>
+
+      <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>
   </section>
 </template>
 
 <script>
 import util from "@/common/js/util"; // 全局公共库
 import { mapGetters } from "vuex";
-import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
-	import { listXmBranchState,loadProjectStateToXmBranchState } from '@/api/xm/core/xmBranchState';
-  
-	import Guider from '@/components/Guider/Index.js';
+import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+import { listXmBranchState  } from '@/api/xm/core/xmBranchState'; 
+import { listXmBranchFiveDayTaskCnt  } from '@/api/xm/core/xmBranchStateHis';
+import Guider from '@/components/Guider/Index.js';
 export default {
   computed: {
     ...mapGetters(["userInfo"]),
     finish: function (){
-      return this.xmBranchState.totalCompleteTaskCnt;
+      return this.xmBranchState.taskFinishCnt;
     },
     notStart: function() {
-      return this.xmBranchState.totalTaskCnt-this.xmBranchState.totalCompleteTaskCnt;
+      return this.xmBranchState.taskCnt-this.xmBranchState.taskFinishCnt;
     },
     totalTask: function() {
-      return this.xmBranchState.totalTaskCnt;
+      return this.xmBranchState.taskCnt;
     },
     taskProgress: function (){
       return this.xmBranchState.finishRate;
@@ -363,47 +162,77 @@ export default {
     taskMng: function (){
       return this.xmBranchState.createUsername;
     },
-    workloadProgress:function (){
-      return Math.round(this.xmBranchState.totalActWorkload/this.xmBranchState.estimateWorkload*100);
+    workloadProgress:function (){ 
+      if(!this.xmBranchState.budgetWorkload){
+        return 0;
+      }
+      if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
+        return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.budgetWorkload*100)
+      }else{
+        return 100;
+      }
     },
     deviation:function (){
-      return Math.round(this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload);
+      return Math.round(this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload);
     },
     deviationRate:function (){
-      return Math.round((this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
+      return Math.round((this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
     },
     remainWorkload:function (){
-      return this.xmBranchState.totalPlanWorkload - this.xmBranchState.totalActWorkload;
+      return this.xmBranchState.budgetWorkload - this.xmBranchState.actWorkload;
     },
+
     planProgress:function (){
-      if(!this.xmBranchState.totalPlanWorkload){
+      if(!this.xmBranchState.budgetWorkload){
         return 0;
       }
-      return parseInt( this.xmBranchState.estimateWorkload/this.xmBranchState.totalPlanWorkload*100)
+      return Math.round( this.xmBranchState.estimateWorkload/this.xmBranchState.budgetWorkload*100)
     },
+
     realProgress:function (){
-      if(!this.xmBranchState.totalPlanWorkload){
+      if(!this.xmBranchState.budgetWorkload){
         return 0;
       }
-      if(this.xmBranchState.totalActWorkload < this.xmBranchState.totalPlanWorkload){
-        return Math.round(this.xmBranchState.totalActWorkload/this.xmBranchState.totalPlanWorkload*100)
+      if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
+        return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.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
-    }, 
+    },
 
-  }, 
+  },
   watch:{
     xmBranchStateCpd:function(){
+      this.drawWorkload();
       this.drawAllBar();
-      this.drawTaskByDate();
-      this.drawPieBug();
       this.drawCostPie();
-      this.drawWorkload();
+      this.drawPieBug();
       this.drawIterationProduct();
+    },
+    xmTaskFiveDaysCpd:function(){ 
+      this.drawTaskByDate();
     }
   },
   data() {
@@ -411,7 +240,8 @@ export default {
       isActive: true,
       xmBranchState:{},
       maxTableHeight:300,
-     // dicts: getDefOptions(),//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+      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'}]}
     };
   },
 
@@ -420,61 +250,72 @@ export default {
       // 基于准备好的dom，初始化echarts实例
       let allChart = this.$echarts.init(document.getElementById("allChart"));
       let option = {
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
-        },
+        color:['#A3BCFA', '#A3BCFA', '#A3BCFA'],
         grid: {
           left: '3%',
           right: '4%',
-          bottom: '10%',
+          bottom: '3%',
           containLabel: true
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          }, 
         },
         xAxis: {
           type: 'category',
-          data: ['需求', '任务', '缺陷']
+          boundaryGap: true,
+          data: ['需求', '任务', '缺陷'], 
         },
         series: [
           {
-            label: {
-              normal:{
-                show: true,
-                position: 'top',
-                color:'#000000',
-              }
+            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'
+              }],
             },
-            data: [
-              {
-                value: this.xmBranchState.menuCnt,
-                itemStyle: {
-                  normal:{
-                    color: '#99CCFF'
-                  }
-                }
-              },
-              {
-                value: this.xmBranchState.totalTaskCnt,
-                itemStyle: {
-                  normal:{
-                    color: '#99CCFF'
-                  }
-                }
-              },
-              {
-                value: this.xmBranchState.totalBugCnt,
-                itemStyle: {
-                  normal:{
-                    color: '#99CCFF'
-                  }
-                }
-              },
-            ],
-            type: 'bar'
           }
         ]
       };
@@ -488,7 +329,7 @@ export default {
         tooltip: {
           trigger: 'axis'
         },
-        color:['rgb(0, 153, 255)','#6699CC'],
+        color:['#76AEF7', '#A8E5FA'],
         legend: {
           data: ['未开始', '进行中']
         },
@@ -498,58 +339,151 @@ export default {
           bottom: '5%',
           containLabel: true
         },
-        toolbox: {
-          feature: {
-            saveAsImage: {}
-          }
-        },
         xAxis: {
           type: 'category',
           boundaryGap: false,
-          data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+          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'
+          type: 'value',
+          boundaryGap: false,
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          splitLine: {
+            lineStyle: {
+              color: 'rgba(0, 0, 0, .05)'
+            }
+          }
         },
         series: [
           {
             name: '未开始',
             type: 'line',
-            //stack: '总量',
-            data: [120, 132, 101, 134, 90, 230, 210],
-            areaStyle: {
-              normal:{
-                color:"rgb(153, 204, 255)" , //设置折线图颜色
-              }
+            smooth: true,
+            data: this.xmTaskFiveDaysCpd[1],
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'right',
+              color: '#888',
+              formatter: ({
+                data
+              }) => data == 0 ? '' : `${data}`
             },
-            lineStyle:{
-              normal:{
-                color:'rgb(0, 153, 255)'
+            markPoint: {
+              data: [
+                {
+                  type: 'min',
+                  name: 'min'
+                },
+                {
+                  type: 'max',
+                  name: 'max'
+                }
+              ],
+            },
+            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)"
+                      }
+                    ]
+                }
               }
             },
           },
           {
             name: '进行中',
             type: 'line',
-            //stack: '总量',
-            data: [220, 182, 191, 234, 290, 330, 310],
+            smooth: true,
+            data: this.xmTaskFiveDaysCpd[2],
             areaStyle: {
-              normal:{
-                color:"rgb(153, 204, 255)", //设置折线图颜色
-              }
+              opacity: 0.8,
+              color: 'rgb(55, 162, 255)'
             },
-            lineStyle:{
-              normal:{
-                color:'#6699CC'
+            label: {
+              show: true,
+              position: 'right',
+              color: '#888',
+              formatter: ({
+                data
+              }) => data == 0 ? '' : `${data}次`
+            },
+            markPoint: {
+              data: [
+                {
+                  type: 'min',
+                  name: 'min'
+                },
+                {
+                  type: 'max',
+                  name: 'max'
+                }
+              ],
+            },
+            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)"
+                      }
+                    ]
+                }
               }
             },
           },
         ],
       };
-
       // 绘制图表
       taskChart.setOption(option);
     },
+
     drawPieBug() {
       let bugPieChart = this.$echarts.init(document.getElementById("bugPieChart"));
       let option = {
@@ -558,12 +492,14 @@ export default {
           formatter: '{b} : {c} ({d}%)'
         },
         legend: {
-          orient: 'vertical',
-          left: 'left',
+          orient: 'horizontal',
+          bottom: '80',
+          data: ['已关闭', '已解决', '已激活', '已确认'],
+          itemGap: 30,
         },
         series: [
           {
-            center:['55%','40%'],//饼图位置
+            center:['48%','40%'],//饼图位置
             type: 'pie',
             radius: '50%',//饼图半径大小
             label:{            //饼图图形上的文本标签
@@ -581,34 +517,82 @@ export default {
               }
             },
             data: [
-              {value: this.xmBranchState.totalClosedBugCnt,
+              {value: this.xmBranchState.closedBugs,
                 itemStyle: {
                   normal:{
-                    color: '#5470C6'
+                    color: '#47CBF6'
+                  }
+                },
+                name: '已关闭',
+                label: {
+                  normal: {
+                    color: '#47CBF6'
                   }
                 },
-                name: '已关闭'},
-              {value: this.xmBranchState.totalResolvedBugCnt,
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
+              {value: this.xmBranchState.resolvedBugs,
                 itemStyle: {
                   normal:{
-                    color: '#91CC75'
+                    color: '#88B0BA'
+                  }
+                },
+                name: '已解决',
+                label: {
+                  normal: {
+                    color: '#88B0BA'
                   }
                 },
-                name: '已解决'},
-              {value: this.xmBranchState.totalActiveBugCnt,
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
+              {value: this.xmBranchState.activeBugs,
                 itemStyle: {
                   normal:{
-                    color: '#FAC858'
+                    color: '#F6AD48'
+                  }
+                },
+                name: '已激活',
+                label: {
+                  normal: {
+                    color: '#F6AD48'
                   }
                 },
-                name: '已激活'},
-              {value: this.xmBranchState.totalConfirmedBugCnt,
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
+              {value: this.xmBranchState.confirmedBugs,
                 itemStyle: {
                   normal:{
-                    color: '#EE6666'
+                    color: '#467AF6'
+                  }
+                },
+                name: '已确认',
+                label: {
+                  normal: {
+                    color: '#467AF6'
                   }
                 },
-                name: '已确认'},
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
             ],
             emphasis: {
               itemStyle: {
@@ -624,6 +608,7 @@ export default {
       // 绘制图表
       bugPieChart.setOption(option);
     },
+
     drawCostPie() {
       let planTotalCostPie = this.$echarts.init(document.getElementById("planTotalCostPie"));
       let option = {
@@ -632,12 +617,14 @@ export default {
           formatter: '{b} : {c} ({d}%)'
         },
         legend: {
-          bottom: 10,
-          left: 'center',
+          orient: 'horizontal',
+          bottom: '80',
+          data: ['非人力', '内部人力', '外购人力'],
+          itemGap: 30,
         },
         series: [
           {
-            center:['55%','40%'],//饼图位置
+            center:['48%','40%'],//饼图位置
             type: 'pie',
             radius: '50%',//饼图半径大小
             label:{            //饼图图形上的文本标签
@@ -655,27 +642,64 @@ export default {
               }
             },
             data: [
-              {value: this.xmBranchState.totalBudgetNouserAmount,
+              {
+                value: this.xmBranchState.budgetNouserAt,
                 itemStyle: {
                   normal:{
-                    color: '#FAC858'
+                    color: '#46CBF6'
                   }
                 },
-                name: '非人力'},
-              {value: this.xmBranchState.totalBudgetIuserAmount,
+                name: '非人力',
+                label: {
+                  normal: {
+                    color: '#46CBF6'
+                  },
+                },
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
+              {value: this.xmBranchState.budgetIuserAt,
                 itemStyle: {
                   normal:{
-                    color: '#73C0DE'
+                    color: '#F7AE48'
                   }
                 },
-                name: '内部人力'},
-              {value: this.xmBranchState.totalBudgetOuserAmount,
+                name: '内部人力',
+                label: {
+                  normal: {
+                    color: '#F7AE48'
+                  },
+                },
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
+              {value: this.xmBranchState.budgetOuserAt,
                 itemStyle: {
                   normal:{
-                    color: '#5470C6'
+                    color: '#4679F6'
                   }
                 },
-                name: '外购人力'},
+                name: '外购人力',
+                label: {
+                  normal: {
+                    color: '#4679F6'
+                  }
+                },
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
             ],
             emphasis: {
               itemStyle: {
@@ -693,61 +717,112 @@ 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: {
-          bottom: 10,
-          left: 'center',
+          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;
+          },
+
         },
         series: [
           {
-            center:['55%','40%'],//饼图位置
+            center:['30%','40%'],//饼图位置
             type: 'pie',
-            radius: '50%',//饼图半径大小
+            radius: ['40%', '70%'],//饼图半径大小
             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
-              }
+              show: false,
+              position: 'center'
             },
             data: [
-              {value: this.xmBranchState.totalPlanIuserWorkload,
+              {
+                value: this.xmBranchState.budgetIuserWorkload,
                 itemStyle: {
                   normal:{
-                    color: '#91CC75'
+                    color: '#3AC2ED'
                   }
                 },
-                name: '内部人力'},
-              {value: this.xmBranchState.totalPlanOuserWorkload,
+                name: '内部人力',
+                label: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                },
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
+              {value: this.xmBranchState.budgetOuserWorkload,
                 itemStyle: {
                   normal:{
-                    color: '#3BA272'
+                    color: '#4072F5'
+                  }
+                },
+                name: '外购人力',
+                label: {
+                  normal: {
+                    position: "inner",
+                    show: false
                   }
                 },
-                name: '外购人力'},
+                labelLine: {
+                  normal: {
+                    position: "inner",
+                    show: false
+                  }
+                }
+              },
             ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
+
           }
         ]
       };
-
       // 绘制图表
       workloadDistribution.setOption(option);
     },
@@ -761,19 +836,65 @@ export default {
             type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
           },
         },
+        grid: {
+          left: '1%',
+          right: '3%',
+          bottom: '5%',
+          containLabel: true
+        },
         xAxis: {
-          type: 'category',
-          data: ['产品数', '迭代数']
+          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'
+          }
         },
         yAxis: {
-          type: 'value'
+          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'
+          }
         },
         series: [{
           label: {
             normal:{
               show: true,
-              position: 'top',
-              color:'#000000',
+              position: 'inside',
+              color:'#fff',
+              fontSize: '14'
             }
           },
           data: [this.xmBranchState.productCnt, this.xmBranchState.iterationCnt],
@@ -781,7 +902,7 @@ export default {
           showBackground: true,
           itemStyle: {
             normal:{
-              color: '#87CEFA'
+              color: '#467AF6'
             }
           },
           backgroundStyle: {
@@ -793,6 +914,7 @@ export default {
       // 绘制图表
       iterationAndProduct.setOption(option);
     },
+
     searchXmBranchState(callBack){
       listXmBranchState({branchId:this.userInfo.branchId}).then(res=>{
         var tips=res.data.tips;
@@ -806,204 +928,236 @@ export default {
         }
       });
     },
-    
+
+    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();
+          })
+        }
+      });
+    },
+
+
     //路由跳转
     gotolink(link) {
       this.$router.replace(link);
     },
-    
+
     /**end 自定义函数请在上面加**/
     guiderStart(forceDisplayWhileClosed) { // 初始化引导页
-      Guider.startByName('xmHomePage',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.$nextTick(() => {
-      this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el) 
-    }); 
-    this.drawAllBar();
+    //this.searchXmBranchState( this.guiderStart );
+    this.searchXmBranchState();
+    this.searchXmBranchFiveDayTaskCnt();
+    this.drawWorkload();
     this.drawTaskByDate();
-    this.drawPieBug();
+    this.drawAllBar();
     this.drawCostPie();
-    this.drawWorkload();
+    this.drawPieBug();
     this.drawIterationProduct();
-    this.searchXmBranchState( this.guiderStart );
   },
 
 };
 </script>
 
 <style scoped lang="scss">
-.container {
-  margin: 10px;
-}
-
-.header {
-  display: flex;
-  justify-content: flex-start;
-  padding: 10px;
-
-  span {
-    padding-right: 15px;
-  }
-}
-
-.col {
-  margin-bottom: 20px;
-}
-
-.icon {
-  color: #fff;
-  height: 30px;
-  width: 30px;
-  border-radius: 15px;
-  text-align: center;
-  line-height: 30px;
-  font-size: 20px;
-  display: inline-block;
-  margin-right: 5px;
-}
-
-.icon2 {
-  color: #000000;
-  height: 30px;
-  width: 30px;
-  border-radius: 15px;
-  text-align: center;
-  line-height: 30px;
-  font-size: 20px;
-  display: inline-block;
-  margin-right: 5px;
-  margin-left: 5px;
-}
+.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;
+    }
 
-.item {
-  display: flex;
-  justify-content: flex-start;
-  position: relative;
-  .progress-item{
-    position:absolute; width:80%;
-  }
-}
+    .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;
+        }
+      }
+    }
 
-.card-font {
-  color: #000000;
-  font-size: 12px;
+    .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;
+          }
+        }
+      }
 
-  .el-col {
-    margin-bottom: 20px;
-  }
-}
+      .r2 {
+        width: 540px;
+        background-color: #fff;
+        .r2 {
+          width: 100%;
+          height: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
 
-.calendar-header {
-  display: flex;
-  justify-content: space-between;
+    .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;
+      }
+    }
 
-  .cal-header-boxs {
-    flex: 1;
-    display: flex;
-    justify-content: flex-end;
+    .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;
+      }
 
-    .cal-header-box {
-      padding: 5px;
-      height: 45px;
-      margin-left: 10px;
     }
 
-    .box-icon {
-      text-align: center;
+    .r_text  {
+      font-size: 20px;
+      color: #7D7D7D;
+      margin: 26px 0 50px 28px;
     }
 
-    .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>
 
-<style>
-.app-container{
-  padding: 20px;
-  padding-bottom: 0;
-}
 </style>
-<style scoped lang="scss" >
- .menu {
-    background: white;
-    min-height: 280px;
-    margin-top: 10px;
-    .menu-content {
-      display: flex;
-      justify-content: flex-start;
-      padding: 10px;
-      flex-wrap: wrap;
-      .quick-menu {
-        height: 80px;
-        width: 60px;
-        margin-right: 15px;
-        cursor: pointer;
-        margin-bottom: 20px;
-        .quick-menu-icon-outer {
-          width: 52px;
-          height: 52px;
-          padding: 6px;
-          border: 1px solid transparent;
-          border-radius: 5px;
-          text-align: center;
-          line-height: 52px;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          img {
-            width: 30px;
-            color: white;
-          }
-        }
-        .quick-menu-text {
-          height: 30px;
-          width: 60px;
-          line-height: 30px;
-          font-size: 12px;
-          color: #333;
-          float: left;
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: nowrap;
-          text-align: center;
-        }
-      }
-      .quick-menu:hover {
-        opacity: 0.8;
-        .quick-menu-text {
-          color: rgb(3, 169, 244);
-        }
-      }
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/xm/XmOverview2.vue b/src/views/xm/XmOverview2.vue
deleted file mode 100644
index c714272d..00000000
--- a/src/views/xm/XmOverview2.vue
+++ /dev/null
@@ -1,1163 +0,0 @@
-<template>
-  <section class="page-container">
-    <div class="page-main">
-      <div class="row_1">
-        <div class="r r1">
-          <span style="color: #4779F6">{{xmBranchState.projectCnt || 0}}</span>
-          <p>项目数</p>
-        </div>
-        <div class="r r2">
-          <span style="color: #4779F6">{{xmBranchState.budgetWorkload || 0}}</span>
-          <p>项目总工时</p>
-        </div>
-        <div class="r r3">
-          <span style="color: #F6AE47">{{xmBranchState.productCnt || 0}}</span>
-          <p>产品数</p>
-        </div>
-        <div class="r r4">
-          <span style="color: #F6AE47">{{xmBranchState.productBudgetWorkload || 0}}</span>
-          <p>产品总工时</p>
-        </div>
-        <div class="r r5">
-          <span style="color: #47CBF6">{{xmBranchState.phaseCnt || 0}}</span>
-          <p>计划数</p>
-        </div>
-        <div class="r r6">
-          <span style="color: #47CBF6">{{xmBranchState.iterationCnt || 0}}</span>
-          <p>迭代数</p>
-        </div>
-        <div class="r r7">
-          <span style="color: #F68D47">{{xmBranchState.planWorkerCnt || 0}}</span>
-          <p>总人数</p>
-        </div>
-        <div class="r r8">
-          <span style="color: #7D7D7D">{{xmBranchState.taskCnt || 0}}</span>
-          <p>任务数</p>
-        </div>
-        <div class="r r9">
-          <span style="color: #7D7D7D">{{xmBranchState.menuCnt || 0}}</span>
-          <p>需求数</p>
-        </div>
-      </div>
-
-      <div class="row_2">
-        <div class="r1">
-          <p class="r_text">项目进度</p>
-          <div class="message">
-            <div>
-              <span>{{this.xmBranchState.estimateWorkload || 0}}h</span>
-              <p>预估工时</p>
-            </div>
-            <div>
-              <span>{{this.xmBranchState.actWorkload || 0}}h</span>
-              <p>登记工时</p>
-            </div>
-            <div>
-              <span>{{workloadProgress || 0}}%</span>
-              <p>工时进度</p>
-            </div>
-            <div>
-              <span>{{remainWorkload || 0}}h</span>
-              <p>剩余工时</p>
-            </div>
-            <div>
-              <span>{{deviation || 0}}h</span>
-              <p>预估偏差</p>
-            </div>
-            <div>
-              <span>{{deviationRate || 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>
-
-        <div class="r2">
-          <p class="r_text">工作量分布</p>
-          <div class="chart">
-            <div id="workloadDistribution" :style="{width: '100%', height: '250px'}"></div>
-          </div>
-        </div>
-      </div>
-
-      <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>
-
-      <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>
-  </section>
-</template>
-
-<script>
-import util from "@/common/js/util"; // 全局公共库
-import { mapGetters } from "vuex";
-import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-import { listXmBranchState  } from '@/api/xm/core/xmBranchState'; 
-import { listXmBranchFiveDayTaskCnt  } from '@/api/xm/core/xmBranchStateHis';
-import Guider from '@/components/Guider/Index.js';
-export default {
-  computed: {
-    ...mapGetters(["userInfo"]),
-    finish: function (){
-      return this.xmBranchState.taskFinishCnt;
-    },
-    notStart: function() {
-      return this.xmBranchState.taskCnt-this.xmBranchState.taskFinishCnt;
-    },
-    totalTask: function() {
-      return this.xmBranchState.taskCnt;
-    },
-    taskProgress: function (){
-      return this.xmBranchState.finishRate;
-    },
-    taskStartTime: function (){
-      return this.xmBranchState.startTime.substring(0,10);
-    },
-    taskEndTime: function (){
-      return this.xmBranchState.endTime.substring(0,10);
-    },
-    taskMng: function (){
-      return this.xmBranchState.createUsername;
-    },
-    workloadProgress:function (){ 
-      if(!this.xmBranchState.budgetWorkload){
-        return 0;
-      }
-      if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
-        return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.budgetWorkload*100)
-      }else{
-        return 100;
-      }
-    },
-    deviation:function (){
-      return Math.round(this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload);
-    },
-    deviationRate:function (){
-      return Math.round((this.xmBranchState.actWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
-    },
-    remainWorkload:function (){
-      return this.xmBranchState.budgetWorkload - this.xmBranchState.actWorkload;
-    },
-
-    planProgress:function (){
-      if(!this.xmBranchState.budgetWorkload){
-        return 0;
-      }
-      return Math.round( this.xmBranchState.estimateWorkload/this.xmBranchState.budgetWorkload*100)
-    },
-
-    realProgress:function (){
-      if(!this.xmBranchState.budgetWorkload){
-        return 0;
-      }
-      if(this.xmBranchState.actWorkload < this.xmBranchState.budgetWorkload){
-        return Math.round(this.xmBranchState.actWorkload/this.xmBranchState.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
-    },
-
-  },
-  watch:{
-    xmBranchStateCpd:function(){
-      this.drawWorkload();
-      this.drawAllBar();
-      this.drawCostPie();
-      this.drawPieBug();
-      this.drawIterationProduct();
-    },
-    xmTaskFiveDaysCpd:function(){ 
-      this.drawTaskByDate();
-    }
-  },
-  data() {
-    return {
-      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'}]}
-    };
-  },
-
-  methods:{
-    drawAllBar() {
-      // 基于准备好的dom，初始化echarts实例
-      let allChart = this.$echarts.init(document.getElementById("allChart"));
-      let option = {
-        color:['#A3BCFA', '#A3BCFA', '#A3BCFA'],
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
-        yAxis: {
-          type: 'value',
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          }, 
-        },
-        xAxis: {
-          type: 'category',
-          boundaryGap: true,
-          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'
-              }],
-            },
-          }
-        ]
-      };
-
-      // 绘制图表
-      allChart.setOption(option);
-    },
-    drawTaskByDate() {
-      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'
-                }
-              ],
-            },
-            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)"
-                      }
-                    ]
-                }
-              }
-            },
-          },
-          {
-            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}次`
-            },
-            markPoint: {
-              data: [
-                {
-                  type: 'min',
-                  name: 'min'
-                },
-                {
-                  type: 'max',
-                  name: 'max'
-                }
-              ],
-            },
-            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)"
-                      }
-                    ]
-                }
-              }
-            },
-          },
-        ],
-      };
-      // 绘制图表
-      taskChart.setOption(option);
-    },
-
-    drawPieBug() {
-      let bugPieChart = this.$echarts.init(document.getElementById("bugPieChart"));
-      let option = {
-        tooltip: {
-          trigger: 'item',
-          formatter: '{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'horizontal',
-          bottom: '80',
-          data: ['已关闭', '已解决', '已激活', '已确认'],
-          itemGap: 30,
-        },
-        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
-              }
-            },
-            data: [
-              {value: this.xmBranchState.closedBugs,
-                itemStyle: {
-                  normal:{
-                    color: '#47CBF6'
-                  }
-                },
-                name: '已关闭',
-                label: {
-                  normal: {
-                    color: '#47CBF6'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.resolvedBugs,
-                itemStyle: {
-                  normal:{
-                    color: '#88B0BA'
-                  }
-                },
-                name: '已解决',
-                label: {
-                  normal: {
-                    color: '#88B0BA'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.activeBugs,
-                itemStyle: {
-                  normal:{
-                    color: '#F6AD48'
-                  }
-                },
-                name: '已激活',
-                label: {
-                  normal: {
-                    color: '#F6AD48'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.confirmedBugs,
-                itemStyle: {
-                  normal:{
-                    color: '#467AF6'
-                  }
-                },
-                name: '已确认',
-                label: {
-                  normal: {
-                    color: '#467AF6'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-
-      // 绘制图表
-      bugPieChart.setOption(option);
-    },
-
-    drawCostPie() {
-      let planTotalCostPie = this.$echarts.init(document.getElementById("planTotalCostPie"));
-      let option = {
-        tooltip: {
-          trigger: 'item',
-          formatter: '{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'horizontal',
-          bottom: '80',
-          data: ['非人力', '内部人力', '外购人力'],
-          itemGap: 30,
-        },
-        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
-              }
-            },
-            data: [
-              {
-                value: this.xmBranchState.budgetNouserAt,
-                itemStyle: {
-                  normal:{
-                    color: '#46CBF6'
-                  }
-                },
-                name: '非人力',
-                label: {
-                  normal: {
-                    color: '#46CBF6'
-                  },
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.budgetIuserAt,
-                itemStyle: {
-                  normal:{
-                    color: '#F7AE48'
-                  }
-                },
-                name: '内部人力',
-                label: {
-                  normal: {
-                    color: '#F7AE48'
-                  },
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.budgetOuserAt,
-                itemStyle: {
-                  normal:{
-                    color: '#4679F6'
-                  }
-                },
-                name: '外购人力',
-                label: {
-                  normal: {
-                    color: '#4679F6'
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-
-      // 绘制图表
-      planTotalCostPie.setOption(option);
-    },
-    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;
-          },
-
-        },
-        series: [
-          {
-            center:['30%','40%'],//饼图位置
-            type: 'pie',
-            radius: ['40%', '70%'],//饼图半径大小
-            label:{            //饼图图形上的文本标签
-              show: false,
-              position: 'center'
-            },
-            data: [
-              {
-                value: this.xmBranchState.budgetIuserWorkload,
-                itemStyle: {
-                  normal:{
-                    color: '#3AC2ED'
-                  }
-                },
-                name: '内部人力',
-                label: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-              {value: this.xmBranchState.budgetOuserWorkload,
-                itemStyle: {
-                  normal:{
-                    color: '#4072F5'
-                  }
-                },
-                name: '外购人力',
-                label: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                },
-                labelLine: {
-                  normal: {
-                    position: "inner",
-                    show: false
-                  }
-                }
-              },
-            ],
-
-          }
-        ]
-      };
-      // 绘制图表
-      workloadDistribution.setOption(option);
-    },
-    drawIterationProduct() {
-      let iterationAndProduct = this.$echarts.init(document.getElementById("iterationAndProduct"));
-      let option = {
-        tooltip: {
-          trigger: 'axis',
-          formatter: '{b} : {c}',
-          axisPointer: {            // 坐标轴指示器，坐标轴触发有效
-            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'
-          }
-        },
-        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'
-          }
-        },
-        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'
-          }
-        }]
-      };
-
-      // 绘制图表
-      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();
-          })
-        }
-      });
-    },
-
-
-    //路由跳转
-    gotolink(link) {
-      this.$router.replace(link);
-    },
-
-    /**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();
-  },
-
-};
-</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;
-    }
-
-    .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;
-        }
-      }
-    }
-
-    .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;
-          }
-        }
-      }
-
-      .r2 {
-        width: 540px;
-        background-color: #fff;
-        .r2 {
-          width: 100%;
-          height: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-        }
-      }
-    }
-
-    .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;
-      }
-    }
-
-    .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;
-      }
-
-    }
-
-    .r_text  {
-      font-size: 20px;
-      color: #7D7D7D;
-      margin: 26px 0 50px 28px;
-    }
-
-  }
-
-
-
-
-}
-
-
-</style>