From dc91db9bb3473c3ed058f86f74359e15c035a8a5 Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Mon, 23 Aug 2021 22:13:10 +0800
Subject: [PATCH] 表查询完善

---
 src/views/securityUnitOperation/operationAnalysis.vue |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index 1134e14..6879482 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -208,15 +208,7 @@
   },
   methods: {
     setEchart() {
-      this.loading3 = true;
       let data = [];
-      if (!this.echartDom.bottomEchart) {
-        this.echartDom.bottomEchart = echarts.init(
-          document.getElementById("bottomEchart")
-        );
-        this.echartDom.bottomEchart.setOption(echartJs.bottomOption1(data));
-      }
-      this.loading3 = false;
 
       let data1 = [];
       if (!this.echartDom.bottomEchart1) {
@@ -229,10 +221,12 @@
     toOperationTable() {
       this.$router.push({
         path:
-          "/securityUnitOperation/operationTable?jurisdiction =" +
+          "/securityUnitOperation/operationTable?jurisdiction=" +
           this.value2 +
-          "&enterpriseName =" +
-          this.enterpriseName
+          "&enterpriseName=" +
+          this.enterpriseName +
+          "&jurisdiction1=" +
+          this.value1
       });
     },
     getFenju() {
@@ -255,9 +249,10 @@
       getCompanys({ jurisdiction: this.value1 }).then(res => {
         if (res.data.code === 200) {
           this.options2 = res.data.data;
-          debugger
           this.value2 = this.options2[0] ? this.options2[0].departmentid : "";
-          this.enterpriseName = this.options2[0] ? this.options2[0].enterpriseName : "";
+          this.enterpriseName = this.options2[0]
+            ? this.options2[0].enterpriseName
+            : "";
           this.changeCompanys();
         }
       });
@@ -311,6 +306,7 @@
     },
     getQueryYearG() {
       this.loading1 = true;
+      this.loading3 = true;
       let params = {
         jurisdiction: this.value1,
         deptid: this.value2
@@ -325,7 +321,16 @@
           this.echartDom.middleEchart1.setOption(
             echartJs.middleOption1(res.data.data)
           );
+          if (!this.echartDom.bottomEchart) {
+            this.echartDom.bottomEchart = echarts.init(
+              document.getElementById("bottomEchart")
+            );
+          }
+          this.echartDom.bottomEchart.setOption(
+            echartJs.bottomOption1(res.data.data)
+          );
         }
+        this.loading3 = false;
         this.loading1 = false;
       });
     },
@@ -350,7 +355,7 @@
     },
     changeCompanys() {
       this.options2.forEach(item => {
-        if (item.value === this.value2) {
+        if (item.departmentid === this.value2) {
           this.enterpriseName = item.enterpriseName;
         }
       });

--
Gitblit v1.9.3