Merge branch 'bugfix_zhy123' into dev

src/views/modules/cpts/baobiao/index.vue

@@ -148,6 +148,14 @@ export default {
 
     async exportAll(reportId, paramKey, reportName) {
       const url = "/oper/customize/icCustomerReport/batch-export";
+
+      const loading = this.$loading({
+        lock: true,
+        text: "批量导出中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.5)",
+      });
+
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
@@ -158,6 +166,7 @@ export default {
         responseType: "blob",
       })
         .then((res) => {
+          loading.close();
           console.log("批量导出接口返回", res);
           // let fileName = window.decodeURI(
           //   res.headers["content-disposition"].split(";")[1].split("=")[1]
@@ -177,6 +186,8 @@ export default {
         })
         .catch((err) => {
           console.log("批量导出失败", err);
+
+          loading.close();
           return this.$message.error("网络错误");
         });
     },

src/views/modules/visual/shundeju/controlCount.vue

@@ -48,7 +48,7 @@
               >
             </el-date-picker>
           </div>
-        </div>  
+        </div>
       </div>
       <div class="warning-box-bottom">
         <screen-table
@@ -180,7 +180,7 @@ export default {
   methods: {
     // 从这里开始写
     async getChartTraffic () {
-      const url = "/pli/power/visitVisitor/chart/traffic";
+      const url = "/epmetuser/icResiCollectVisitor/chart/traffic";
       let params = {
         date: this.timeFormat(this.lineTime)
       };
@@ -231,7 +231,7 @@ export default {
           }
         })
         this.total = data.total
-        
+
       } else {
       }
       this.visibleLoading = false;
@@ -440,7 +440,7 @@ export default {
           line-height: 24px;
         }
       }
-      
+
     }
   }
 
@@ -533,7 +533,7 @@ export default {
     position: relative;
     flex: 1;
     display: flex;
-    
+
   }
 }
 .echart-wr {