修改了分页代码和类别统计返回按钮

src/views/zdrygl/lbtj.vue

@@ -20,9 +20,9 @@
             type="primary"
             size="mini"
             class="returnBtn"
-            @click="historyCharts2"
+            @click="historyCharts"
             style=""
-            v-if="type == 'map' && historyArr2.length > 0"
+            v-if="type == 'map' && historyArr.length > 1"
     >返回重点人员</el-button
     >
     <div
@@ -60,7 +60,7 @@ export default {
       header: "重点人员信息管理",
       cxUrl: "/zdGzry/getMainZdGzryxx",
       historyArr: [],
-      historyArr2: [],
+      // historyArr2: [],
       secondData: [],
       cxFormData: {
         limit: 10,
@@ -387,7 +387,8 @@ export default {
                 }));
                 debugger
                 //添加到histoy数组
-                _this.historyArr2.push({ x: xData02, data: data02 });
+                // _this.historyArr2.push({ x: xData02, data: data02 });
+                _this.historyArr.push({ x: xData02, data: data02 });
                 //刷新图
                 this.showCharts = false;
                 _this.$nextTick(() => {
@@ -523,24 +524,26 @@ export default {
       this.getCharts(obj.x, obj.data, obj.rotate);
       this.historyArr.pop();
       this.tierNum--;
+      this.$refs.rightContent.clearData();
     },
-    //点击返回上一层事件
-    historyCharts2() {
-      if (this.historyArr.length == 1 && this.historyArr2.length != 1) {
-        this.$message.warning("无法返回");
-        return;
-      }else {
-        // debugger
-        // document.getElementById("charts").dispose()
-      }
-      debugger
-      let obj = this.historyArr2[this.historyArr2.length - 1];
-      this.getCharts(obj.x, obj.data, -30);
-      debugger
+    // //点击返回上一层事件
+    // historyCharts2() {
+    //   if (this.historyArr.length == 1 && this.historyArr2.length != 1) {
+    //     this.$message.warning("无法返回");
+    //     return;
+    //   }else {
+    //     // debugger
+    //     // document.getElementById("charts").dispose()
+    //   }
+    //   debugger
+    //   let obj = this.historyArr2[this.historyArr2.length - 1];
+    //   this.getCharts(obj.x, obj.data, -30);
+    //   debugger
 
-      this.historyArr.pop();
-      this.tierNum--;
-    },
+    //   this.historyArr2.pop();
+    //   this.tierNum--;
+    //   this.$refs.rightContent.clearData();
+    // },
     //下钻处理接口事件
     getChartsData(xzqhdm) {
       let params = new Object();

src/views/zdrygl/zdryGl.vue

@@ -652,11 +652,12 @@ export default {
             this.copTableVisible = true;
             this.copdetailData = res.data.rows;
             this.totalCount = res.data.total;
+            this.loadingD = false;
           } else {
             this.loadingD = false;
           }
         });
-      } else if (this.ztTableVisible == true) {
+      } else if (this.yrTableVisible == true) {
         getDrDetail(newparams).then((res) => {
           if (res.code == 200 && res.success == true && res.data.rows != 0) {
             console.log(res.data.rows);
@@ -670,7 +671,7 @@ export default {
             this.loadingD = false;
           }
         });
-      } else if (this.yrTableVisible == true) {
+      } else if (this.ztTableVisible == true) {
         getZtDetail(newparams).then((res) => {
           if (res.code == 200 && res.success == true && res.data.rows != 0) {
             console.log(res.data.rows);