Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/api/modules/http.js

@@ -40,6 +40,27 @@ export function houseIndex(query) {
   })
 }
 
+//首页设备
+export function findAllZkEquipment(query) {
+  return request({
+    url: 'autoSR/cusStageStatistics/findAllZkEquipment',
+    method:'get',
+    params:query
+  })
+}
+
+
+//首页违禁查询
+export function findProhibitedRecord(query) {
+  return request({
+    url: 'autoSR/cusStageStatistics/findProhibitedRecord',
+    method:'get',
+    params:query
+  })
+}
+
+
+
 
 
 // 代理商管理列表

src/page/wel.vue

@@ -44,7 +44,14 @@
                 <div class="span1">{{cardlist.datalist.receptionCount || 0}}</div>
                 <div class="span2">
                   <span class="span2-1"> 环比:{{cardlist.sequential.receptionCount || 0}}</span>
-                  <span class="span2-2">{{cardlist.liftlist.receptionCount || 0}}%</span>
+                  <span class="span2-2" v-if="cardlist.liftlist.receptionCount>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.receptionCount || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.receptionCount<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.receptionCount || 0}}%
+                  </span>
                 </div>
               </div>
             </div>
@@ -54,7 +61,15 @@
                 <div class="span1">{{cardlist.datalist.activeCustomer || 0}}</div>
                 <div class="span2">
                   <span class="span2-1"> 环比:{{cardlist.sequential.activeCustomer || 0}}</span>
-                  <span class="span2-2">{{cardlist.liftlist.activeCustomer || 0}}%</span>
+                  <!-- <span class="span2-2">{{cardlist.liftlist.activeCustomer || 0}}%</span> -->
+                  <span class="span2-2" v-if="cardlist.liftlist.activeCustomer>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.activeCustomer || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.activeCustomer<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.activeCustomer || 0}}%
+                  </span>
                 </div>
               </div>
             </div>
@@ -67,10 +82,18 @@
             <div class="pagechen">
               <div class="pageboxtitle1">平均接待时长</div>
               <div class="pageboxtitle2">
-                <div class="span1">{{cardlist.datalist.avgDuration || 0}}</div>
+                <div class="span1">{{Math.floor(cardlist.datalist.avgDuration/60) || 0}}</div>
                 <div class="span2">
-                  <span class="span2-1"> 环比:{{cardlist.sequential.avgDuration || 0}}</span>
-                  <span class="span2-2">{{cardlist.liftlist.avgDuration || 0}}%</span>
+                  <span class="span2-1"> 环比:{{Math.floor(cardlist.sequential.avgDuration/60) || 0}}</span>
+                  <!-- <span class="span2-2">{{cardlist.liftlist.avgDuration || 0}}%</span> -->
+                  <span class="span2-2" v-if="cardlist.liftlist.avgDuration>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.avgDuration || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.avgDuration<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.avgDuration || 0}}%
+                  </span>
                 </div>
               </div>
             </div>
@@ -80,7 +103,15 @@
                 <div class="span1">{{cardlist.datalist.fraction || 0}}</div>
                 <div class="span2">
                   <span class="span2-1"> 环比:{{cardlist.sequential.fraction || 0}}</span>
-                  <span class="span2-2">{{cardlist.liftlist.fraction || 0}}%</span>
+                  <!-- <span class="span2-2">{{cardlist.liftlist.fraction || 0}}%</span> -->
+                  <span class="span2-2" v-if="cardlist.liftlist.fraction>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.fraction || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.fraction<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.fraction || 0}}%
+                  </span>
                 </div>
               </div>
             </div>
@@ -92,7 +123,15 @@
                   <div class="span1">{{cardlist.datalist.prohibitedCustomer || 0}}</div>
               <div class="span2">
                 <span class="span2-1"> 环比:{{cardlist.sequential.prohibitedCustomer || 0}}</span>
-                <span class="span2-2">{{cardlist.liftlist.prohibitedCustomer || 0}}%</span>
+                <!-- <span class="span2-2">{{cardlist.liftlist.prohibitedCustomer || 0}}%</span> -->
+                 <span class="span2-2" v-if="cardlist.liftlist.prohibitedCustomer>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.prohibitedCustomer || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.prohibitedCustomer<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.prohibitedCustomer || 0}}%
+                  </span>
               </div>
               </div>
             </div>
@@ -102,7 +141,15 @@
                   <div class="span1">{{cardlist.datalist.prohibitedZb || 0}}</div>
               <div class="span2">
                 <span class="span2-1"> 环比:{{cardlist.sequential.prohibitedZb || 0}}</span>
-                <span class="span2-2">{{cardlist.liftlist.prohibitedZb || 0}}%</span>
+                <!-- <span class="span2-2">{{cardlist.liftlist.prohibitedZb || 0}}%</span> -->
+                  <span class="span2-2" v-if="cardlist.liftlist.prohibitedZb>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.prohibitedZb || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.prohibitedZb<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.prohibitedZb || 0}}%
+                  </span>
               </div>
               </div>
             </div>
@@ -112,7 +159,15 @@
                     <div class="span1">{{cardlist.datalist.accountNum || 0}}</div>
               <div class="span2">
                 <span class="span2-1"> 环比:{{cardlist.sequential.accountNum || 0}}</span>
-                <span class="span2-2">{{cardlist.liftlist.accountNum || 0}}%</span>
+                <!-- <span class="span2-2">{{cardlist.liftlist.accountNum || 0}}%</span> -->
+                  <span class="span2-2" v-if="cardlist.liftlist.accountNum>0">
+                    <i class="el-icon-top" style="color: red;"></i>
+                    {{cardlist.liftlist.accountNum || 0}}%
+                  </span>
+                  <span class="span2-3" v-if="cardlist.liftlist.accountNum<0">
+                     <i class="el-icon-bottom" style="color: #25CEBA;"></i>
+                    {{cardlist.liftlist.accountNum || 0}}%
+                  </span>
               </div>
               </div>
             </div>
@@ -128,11 +183,11 @@
             <div class="tabbox">
               <el-table
                   :header-cell-style="{background:'#F2F4F5'}"
-                  :data="tableData"
+                  :data="prohibitedlist"
                   height="320"
                   style="width: 100%">
                   <el-table-column
-                    prop="name"
+                    prop="agentName"
                     label="顾问"
                     align="center">
                   </el-table-column>
@@ -144,7 +199,7 @@
                   </el-table-column>
 
                   <el-table-column
-                    prop="address"
+                    prop="staTime"
                     label="接待时间"
                     align="center">
                   </el-table-column>
@@ -163,60 +218,64 @@
           </div>
           <div class="you">
             <div class="title">
-              <div class="text1" @click="tabclick('1')" :class="{ colostyle: classatec == 1 }">低电工牌</div>
-              <div class="text1" @click="tabclick('2')" :class="{ colostyle: classatec == 2 }">离线工牌</div>
+              <div class="text1" @click="tabclick('0')" :class="{ colostyle: classatec == 0 }">低电工牌</div>
+              <div class="text1" @click="tabclick('1')" :class="{ colostyle: classatec == 1 }">离线工牌</div>
             </div>
-              <div class="tabbox" v-if="classatec==1">
+              <div class="tabbox" v-if="classatec==0">
                 <el-table
                   :header-cell-style="{background:'#F2F4F5'}"
-                  :data="tableData"
+                  :data="equipmentList"
                   height="320"
                   style="width: 100%">
                   <el-table-column
-                    prop="name"
+                    prop="accName"
                     label="顾问"
                     align="center">
                   </el-table-column>
 
                   <el-table-column
-                    prop="num"
+                    prop="accPhone"
                     label="电话"
                     align="center">
                   </el-table-column>
 
                   <el-table-column
                     prop="address"
-                    label="状态"
+                    label="录音状态"
                     align="center">
+                     <template slot-scope="scope" style="">
+                       <span v-if="scope.row.recCmd=='start'">开启</span>
+                       <span v-if="scope.row.recCmd=='stop'">关闭</span>
+                     </template>
                   </el-table-column>
 
                   <el-table-column
-                    prop="date"
+                    prop="electricity"
                     label="电量"
                     align="center">
                   </el-table-column>
                 </el-table>
               </div>
-              <div class="tabbox" v-if="classatec==2">
+              <div class="tabbox" v-if="classatec==1">
                 <el-table
                   :header-cell-style="{background:'#F2F4F5'}"
-                  :data="tableData"
+                  :data="equipmentList"
                   height="320"
                   style="width: 100%">
                   <el-table-column
-                    prop="name"
+                    prop="accName"
                     label="顾问"
                     align="center">
                   </el-table-column>
 
                   <el-table-column
-                    prop="num"
+                    prop="accPhone"
                     label="电话"
                     align="center">
                   </el-table-column>
 
                   <el-table-column
-                    prop="address"
+                    prop="updateTime"
                     label="离线时间"
                     align="center">
                   </el-table-column>
@@ -249,7 +308,7 @@ export default {
       role:'',
       houseId:"",
       houseList:[],
-      classatec:1,
+      classatec:0,
       customtime:[],
       statDateStart:'',
       statDateEnd:'',
@@ -259,86 +318,9 @@ export default {
         liftlist:{},
         sequential:{},
       },
-         tableData: [
-           {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          {
-            date: '80%',
-            name: '王小虎',
-            address: '正在录音',
-            num:'18655732363'
-          },
-          ]
+      tableData: [],
+      equipmentList:[],
+      prohibitedlist:[],
     }
   },
    mounted() {
@@ -347,10 +329,6 @@ export default {
        this.zkhousePage()
     }
 
-    // comparedStat升降
-    //todayStat今天
-    //yesterdayStat环比
-
   },
   methods: {
     //获取看片数据
@@ -396,9 +374,35 @@ export default {
             }
       });
     },
+    //获取设备
+    findAllZkEquipment(){
+      this.equipmentList=[];
+        this.$api.http.findAllZkEquipment({
+          onLine:this.classatec,
+          houseId:this.houseId
+        }).then((res) => {
+          this.equipmentList=res.data;
+        })
+    },
+    findProhibitedRecord(){
+          this.prohibitedlist=[];
+          this.$api.http.findProhibitedRecord({
+            houseId:this.houseId,
+            dateType: this.TimetoAhoose,
+            statDateStart: this.statDateStart,
+            statDateEnd:this.statDateEnd
+          }).then((res) => {
+              this.prohibitedlist=res.data;
+          })
+    },
+
     //切换楼盘
     houseChange() {
-
+        this.TimetoAhoose=0;
+         this.statDateStart='';
+        this.statDateEnd='';
+        this.getgicd()
+        this.findProhibitedRecord()
     },
     //获取楼盘
     zkhousePage() {
@@ -409,11 +413,14 @@ export default {
         .then((res) => {
           this.houseList = res.data;
           this.houseId = res.data[0].id;
-          this.getgicd()
+          this.getgicd();
+          this.findProhibitedRecord()
+          this.findAllZkEquipment()
         });
     },
       tabclick(i){
         this.classatec=i;
+        this.findAllZkEquipment()
       },
       tabtimetap(i){
         this.statDateStart='';
@@ -421,13 +428,15 @@ export default {
         this.customtime=[];
         this.TimetoAhoose=i;
         this.getgicd()
+        this.findProhibitedRecord()
       },
-      //切换世间
+      //切换时间
       confirmtime() {
         this.statDateStart=this.customtime[0];
         this.statDateEnd=this.customtime[1];
         this.TimetoAhoose=5;
         this.getgicd()
+        this.findProhibitedRecord()
       },
   }
 }
@@ -436,9 +445,10 @@ export default {
 <style scoped="scoped" lang="scss">
 .box-center{
   width: 100%;
-  height: 100%;
+  // height: 100%;
   padding: 15px;
   min-width: 1300px;
+  padding-bottom: 100px;
 }
 .page-container{
   width: 100%;
@@ -493,6 +503,10 @@ export default {
            font-weight: 600;
            color: #E6273A;
          }
+         .span2-3{
+           font-weight: 600;
+           color:#25CEBA;
+         }
       }
     }
   }
@@ -532,7 +546,7 @@ export default {
 
   .app-box-san{
   width: 100%;
-  height: 400px;
+  height: 350px;
   display: flex;
   margin-top: 15px;
   .zuo{