diff --git a/src/page/wel.vue b/src/page/wel.vue
index 8d3a8eb..4a3e751 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box-center">
     <div v-if="role==3">
-      <div class="app-titel">
+      <!-- <div class="app-titel">
               <div class="titel-text">楼盘选择</div>
               <div style="margin-left: 26px">
                 <el-select v-model="houseId" @change="houseChange" placeholder="请选择">
@@ -14,8 +14,8 @@
                 </el-option>
               </el-select>
             </div>
-          </div>
-          <div class="app-titel" style="margin-top:14px;">
+          </div> -->
+          <div class="app-titel">
             <div class="titel-text">时间</div>
             <div class="toptimeqhuan">
               <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">今天</div>
@@ -80,7 +80,7 @@
               </div>
             </div>
             <div class="pagechen">
-              <div class="pageboxtitle1">平均接待时长</div>
+              <div class="pageboxtitle1">平均接待时长(分钟)</div>
               <div class="pageboxtitle2">
                 <div class="span1">{{Math.floor(cardlist.datalist.avgDuration/60) || 0}}</div>
                 <div class="span2">
@@ -98,7 +98,7 @@
               </div>
             </div>
             <div class="pagechen">
-              <div class="pageboxtitle1">销讲执行率</div>
+              <div class="pageboxtitle1">销讲执行率(%)</div>
               <div class="pageboxtitle2">
                 <div class="span1">{{cardlist.datalist.fraction || 0}}</div>
                 <div class="span2">
@@ -118,7 +118,7 @@
         </div>
         <div style=" margin-top: 20px;" class="page-container">
             <div class="pagechen">
-              <div class="pageboxtitle1">违禁预警</div>
+              <div class="pageboxtitle1">违禁预警(个)</div>
               <div class="pageboxtitle2">
                   <div class="span1">{{cardlist.datalist.prohibitedCustomer || 0}}</div>
               <div class="span2">
@@ -136,7 +136,7 @@
               </div>
             </div>
             <div class="pagechen">
-              <div class="pageboxtitle1">违禁占比</div>
+              <div class="pageboxtitle1">违禁占比(%)</div>
               <div class="pageboxtitle2">
                   <div class="span1">{{cardlist.datalist.prohibitedZb || 0}}</div>
               <div class="span2">
@@ -154,7 +154,7 @@
               </div>
             </div>
             <div class="pagechen">
-              <div class="pageboxtitle1">顾问</div>
+              <div class="pageboxtitle1">顾问(个)</div>
               <div class="pageboxtitle2">
                     <div class="span1">{{cardlist.datalist.accountNum || 0}}</div>
               <div class="span2">
@@ -184,8 +184,8 @@
                 <div>暂无数据</div>
               </div>
                <div v-else   class="tabbox" style="display:flex;flex-wrap: wrap;height: 290px;overflow-y: auto;width: 90%;margin:0 auto;">
-                  <div v-for="(item,index) in indexZxllist" :key="index" style="width:130px;margin-left: 16px;margin-top: 10px;">
-                    <div style="width:100%;height:100px;"><el-progress :stroke-width="12" :width='130'  type="dashboard" :percentage="item.fraction" ></el-progress></div>
+                  <div v-for="(item,index) in indexZxllist" :key="index" style="width:33.3%;margin-top: 10px;">
+                    <div style="width:130px;height:100px;margin:0 auto;"><el-progress :stroke-width="12" :width='130'  type="dashboard" :percentage="item.zxl" ></el-progress></div>
                     <div style="width:100%;text-align: center;">{{item.name.substring(0,3)}}</div>
                   </div>
                </div>
@@ -194,28 +194,28 @@
               <div class="title">
                 <div class="text1">员工执行率排名(TOP10)</div>
               </div>
-              <div class="hejisan">
-                  <div class="sanbox1" style="width: 35%;">
-                    <div class="text1-1">合计</div>
-                    <div class="text1-2">1</div>
-                  </div>
+
+              <div  v-if="employeeExecutionRatelist.list.length==0" style="display:flex;justify-content: center; align-items: center;height: 60%;">
+                <div>暂无数据</div>
+              </div>
+              <div class="hejisan"  v-if="employeeExecutionRatelist.list.length!=0">
                   <div  class="sanbox1" style="width: 40%;">
                     <div class="text1-1">顾问</div>
-                    <div class="text1-2">1</div>
+                    <div class="text1-2">{{employeeExecutionRatelist.num || ''}}</div>
                   </div>
                   <div  class="sanbox1" style="width: 25%;">
-                    <div class="text1-1">人均接待量</div>
-                    <div class="text1-2">1</div>
+                    <div class="text1-1">平均执行</div>
+                    <div class="text1-2">{{employeeExecutionRatelist.fraction || ''}}</div>
                   </div>
               </div>
-              <div class="tabbox">
-                <div style="overflow-y:auto;height: 350px;width: 94%;margin: 0 auto;">
-                    <div  class="jinbox" v-for="(item,i) in ceratelist" :key='i'>
-                        <div class="jinboxtit">{{item.name}}</div>
+              <div class="tabbox"  v-if="employeeExecutionRatelist.list.length!=0">
+                <div style="overflow-y:auto;height: 230px;width: 94%;margin: 0 auto;">
+                    <div class="jinbox" v-for="(item,i) in employeeExecutionRatelist.list" :key='i'>
+                        <div class="jinboxtit">{{item.accountName}}</div>
                         <div class="jinbox-box">
-                            <div class="boxbaifenbi" :style="'width:'+(item.avgZxl)+'%;'"></div>
+                            <div class="boxbaifenbi" :style="'width:'+(item.fraction)+'%;'"></div>
                         </div>
-                        <div class="jinboxbott">{{item.avgZxl}}%</div>
+                        <div class="jinboxbott">{{item.fraction}}%</div>
                     </div>
                 </div>
               </div>
@@ -369,22 +369,26 @@ export default {
       tableData: [],
       equipmentList:[],
       prohibitedlist:[],
-      ceratelist:[
-        {name:'还是得',avgZxl:80},
-        {name:'大大奥德赛',avgZxl:90},
-        {name:'沙发和',avgZxl:20},
-        {name:'还是得',avgZxl:10},
-        {name:'还客户家客户是得',avgZxl:80},
-      ],
       indexZxllist:[],
-      employeeExecutionRatelist:[]
+      employeeExecutionRatelist:{
+        num:'',
+        list:[],
+        fraction:''
+      }
 
     }
   },
    mounted() {
     this.role=localStorage.getItem("orgType");
     if(this.role==3){
-       this.zkhousePage()
+      this.houseId = localStorage.getItem("houseId");
+        this.getgicd();
+        this.getindexZxllist()
+        this.getemployeeExecutionRatelist()
+        this.findProhibitedRecord()
+        this.findAllZkEquipment()
+    }else{
+        //  this.zkhousePage()
     }
 
   },
@@ -490,15 +494,18 @@ export default {
           })
     },
     getemployeeExecutionRatelist(){
-          this.employeeExecutionRatelist=[]
+          this.employeeExecutionRatelist={
+            num:'',
+            list:[],
+            fraction:''
+          }
           this.$api.http.getemployeeExecutionRatelist({
             houseId:this.houseId,
             dateType: this.TimetoAhoose,
             statDateStart: this.statDateStart,
             statDateEnd:this.statDateEnd
           }).then((res) => {
-
-               this.employeeExecutionRatelist=res.list
+               this.employeeExecutionRatelist=res.data
           })
     },
 
@@ -753,8 +760,6 @@ export default {
 		width: 92%;
 		margin: 0 auto;
 		display: flex;
-		padding-top: 10px;
-		padding-bottom:10px;
 		.text1-1{
 			color: #666666;
 		}
diff --git a/vue.config.js b/vue.config.js
index a34852c..f966a06 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
  */
 // const url = 'http://pigx-gateway'
 // const url = 'http://39.97.167.65:9999' //测试
-const url = 'http://192.168.31.169:9999' //长龙
-// const url = 'http://192.168.31.133:9999' //嘉豪
+// const url = 'http://192.168.31.169:9999' //长龙
+const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')