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

src/page/index/logo.vue

@@ -25,7 +25,9 @@ export default {
   // },
   methods: {
     goIndex: function () {
-      window.location.href = '/'
+      this.$router.push({
+        path:'/wel'
+      })
     }
   }
 }

src/page/index/tags.vue

@@ -4,7 +4,7 @@
     @click="contextmenuFlag=false"
     class="avue-tags">
     <!-- tag盒子 -->
-    <div
+    <!-- <div
       v-if="contextmenuFlag"
       :style="{left:contentmenuX+'px',top:contentmenuY+'px'}"
       class="avue-tags__contentmenu">
@@ -16,7 +16,7 @@
         class="item"
         @click="closeAllTags">关闭全部
       </div>
-    </div>
+    </div> -->
     <div
       :class="{'avue-tags__box--close':!website.isFirstPage}"
       class="avue-tags__box">

src/page/wel.vue

@@ -559,17 +559,17 @@
             <div class="pagechen">
               <div class="pageboxtitle1">录音总时长(小时)</div>
               <div class="pageboxtitle2">
-              <div class="span1">{{sysSec.receptionTimeCount || 0}}</div>
+              <div class="span1">{{sysSec.receptionTime || 0}}</div>
               <div class="span2">
-                <span class="span2-1"> 环比:{{sysCompare.receptionTimeCount || 0}}</span>
+                <span class="span2-1"> 环比:{{sysCompare.receptionTime || 0}}</span>
                 <!-- <span class="span2-2">{{cardlist.liftlist.accountNum || 0}}%</span> -->
                   <span class="span2-2" v-if="orderBy.receptionTime>0">
                     <i class="el-icon-top" style="color: red;"></i>
-                    {{orderBy.receptionTime || 0}}
+                    {{orderBy.receptionTime || 0}}%
                   </span>
                   <span class="span2-3" v-if="orderBy.receptionTime<0">
                      <i class="el-icon-bottom" style="color: #25CEBA;"></i>
-                    {{orderBy.receptionTime || 0}}
+                    {{orderBy.receptionTime || 0}}%
                   </span>
               </div>
               </div>

src/router/axios.js

@@ -57,23 +57,29 @@ axios.interceptors.request.use(config => {
 }, error => {
   return Promise.reject(error)
 })
-
+let idx=0
 // HTTPresponse拦截
 axios.interceptors.response.use(res => {
   NProgress.done()
   const status = Number(res.status) || 200
   const message = res.data.msg || errorCode[status] || errorCode['default']
+
   if (status === 401) {
-    Message({
-      message: message,
-      type: 'error'
-    })
+    idx++
+    if(idx==1){
+      Message({
+        message: message,
+        type: 'error'
+      })
+    }
     store.dispatch('LogOut').then(() => {
       router.push({ path: '/login' })
     })
     return
+  }else{
+    idx=0
   }
-
+  // console.log(idx);
   if (status !== 200 || res.data.code === 1) {
     Message({
       message: message,

src/views/Equipment/equipmentDetailList.vue

@@ -89,7 +89,7 @@
           <div
             class="alllist"
             @click="compareChange(0)"
-            :class="compareFlag == 0 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 0  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">设备总数</div>
             <div class="alllist-text1">
@@ -114,7 +114,7 @@
           <div
             class="alllist"
             @click="compareChange(1)"
-            :class="compareFlag == 1 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 1  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">在线设备数</div>
             <div class="alllist-text1">
@@ -138,7 +138,7 @@
           <div
             class="alllist"
             @click="compareChange(2)"
-            :class="compareFlag == 2 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 2  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">在线设备平均占比</div>
             <div class="alllist-text1">
@@ -164,7 +164,7 @@
           <div
             class="alllist"
             @click="compareChange(3)"
-            :class="compareFlag == 3 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 3  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">活跃设备数</div>
             <div class="alllist-text1">
@@ -188,7 +188,7 @@
           <div
             class="alllist"
             @click="compareChange(4)"
-            :class="compareFlag == 4 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 4  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">活跃设备平均占比</div>
             <div class="alllist-text1">
@@ -214,7 +214,7 @@
           <div
             class="alllist"
             @click="compareChange(5)"
-            :class="compareFlag == 5 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 5  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">指派次数</div>
             <div class="alllist-text1">
@@ -238,7 +238,7 @@
           <div
             class="alllist"
             @click="compareChange(6)"
-            :class="compareFlag == 6 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 6  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">完整录音次数</div>
             <div class="alllist-text1">
@@ -264,7 +264,7 @@
           <div
             class="alllist"
             @click="compareChange(7)"
-            :class="compareFlag == 7 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 7  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">完整录音占比</div>
             <div class="alllist-text1">
@@ -290,7 +290,7 @@
           <div
             class="alllist"
             @click="compareChange(8)"
-            :class="compareFlag == 8 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 8  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">部分录音</div>
             <div class="alllist-text1">
@@ -318,7 +318,7 @@
           <div
             class="alllist"
             @click="compareChange(9)"
-            :class="compareFlag == 9 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 9  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">未录音</div>
             <div class="alllist-text1">
@@ -342,7 +342,7 @@
           <div
             class="alllist"
             @click="compareChange(10)"
-            :class="compareFlag == 10 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 10  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">正常关机次数</div>
             <div class="alllist-text1">
@@ -370,7 +370,7 @@
           <div
             class="alllist"
             @click="compareChange(11)"
-            :class="compareFlag == 11 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 11  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">低电关机次数</div>
             <div class="alllist-text1">
@@ -398,7 +398,7 @@
           <div
             class="alllist"
             @click="compareChange(12)"
-            :class="compareFlag == 12 && selectTime1 ? 'active' : 'noactive'"
+            :class="compareFlag == 12  ? 'active' : 'noactive'"
           >
             <div class="alllist-text1">异常关机次数</div>
             <div class="alllist-text1">
@@ -1070,6 +1070,7 @@ export default {
       }
       //	获取到数据后对数据进行操作
       //	循环大数组，赋值
+      if(this.selectTime1){
       let timeDate=[]
       let arr1=[]
       let arr2=[]
@@ -1086,6 +1087,7 @@ export default {
       this.compareList = Object.assign([], this.compareList);
       this.$forceUpdate();
       var chartDom = document.getElementById("compare");
+      echarts.init(chartDom).dispose()
       var myChart = echarts.init(chartDom);
       var option;
 
@@ -1165,6 +1167,10 @@ export default {
       window.addEventListener("resize", () => {
         myChart.resize();
       });
+      }else{
+        console.log('第一种');
+      }
+
     },
     //获取统计数据
     getdetail() {

src/views/Equipment/index.vue

@@ -392,7 +392,7 @@
                 > -->
                 <el-dropdown-item
                   command="toinfobinding"
-                  v-if="equ_index_bind&&row.receiveType!=2"
+                  v-if="equ_index_bind&&row.receiveType!=2&&!row.propertyId"
                   >绑定</el-dropdown-item
                 >
                 <el-dropdown-item

src/views/Statistics/ReceptionOverview.vue

@@ -5,7 +5,7 @@
        <div class="app-titel" v-if="role!=3" style="margin-bottom:10px;">
         <div class="titel-text">楼盘选择:</div>
         <div style="margin-left: 26px">
-           <el-select v-model="houseId" placeholder="请选择"  @change="houseChange">
+           <el-select v-model="houseId" filterable placeholder="请选择"  @change="houseChange">
             <el-option
               v-for="item in houseList"
               :key="item.id"
@@ -464,6 +464,7 @@ export default {
           statDateEnd:this.fromobj.statDateEnd,
           deptId:this.departmentsri
       }
+      //  console.log(this.departmentsri,'123');
       if(this.TimetoAhoose==8){
         parmo.dateType=null;
       }
@@ -584,9 +585,13 @@ export default {
             // this.departmentlist=[{name:'全部',deptId:''}]
             // this.departmentlist=this.departmentlist.concat(res.data);
             this.departmentlist=res.data;
+
             this.departmentsri=this.departmentlist[0].deptId;
+            // console.log(this.departmentsri);
+            //  console.log(this.departmentsri,'1');
+             this.overviewteamOrAccountSellingTrends()
         })
-        this.overviewteamOrAccountSellingTrends()
+
     },
     //获取顾问
     overviewfindUserListByHouseId(){

src/views/building/Count.vue

@@ -418,7 +418,7 @@ export default {
           houseId: row.id,
           startDate: this.searchForm.startDate,
           endDate: this.searchForm.endDate,
-          dateType: this.searchForm.dateType,
+          timeType:this.searchForm.dateType
         },
       });
     },
@@ -435,7 +435,7 @@ export default {
         // 公司
         this.selflag='1'
         this.changeValue=row.orgName
-        this.searchForm.agentName=row.orgName
+        this.searchForm.orgName=row.orgName
         this.houseStatistics();
       }
     },