Maxx 10 months ago
parent
commit
a1d3248bc8
2 changed files with 24 additions and 34 deletions
  1. 24 24
      src/views/complianceAnalysis/components/scjg.vue
  2. 0 10
      static/data/ghss/data.js

+ 24 - 24
src/views/complianceAnalysis/components/scjg.vue

@@ -56,7 +56,7 @@
 import pie from "@/components/echartsTemplate/pie.vue";
 import collRecursiveTree from "./collRecursiveTree.vue";
 import { GetFxjg } from "@/api/ghss/hgxfx.js";
-import hgxfx from "../../../../static/data/ghss/data.js";
+// import hgxfx from "../../../../static/data/ghss/data.js";
 import parse from "wellknown";
 let dataSourceList = {};
 let colors = [
@@ -100,29 +100,29 @@ export default {
       this.echarts = [];
       this.$emit("updateParent", "loading", true);
       GetFxjg({ bsm: this.$props.scjgObj.bsm }).then(res => {
-      if (res.success) {
-        res.data.forEach((e, ei) => {
-        let c = e.dataList || [];
-        c.map(ci => {
-          ci.name = ci.yslx_name || ci.scxname;
-          ci.value = this.compute(ci.mj);
-          ci.id = ci.yslx || ci.scxbsm;
-          ci.geom = ci.geom || (ci.data ? ci.data.geom : "");
-          // ci.label = ci.mc_name;
-        });
-        this.echarts.push({
-          id: e.scxbsm,
-          label: e.scxname,
-          children: c,
-          lchildren: e.children || [],
-          iseyes: false,
-          isshow: false
-        });
-        if (c.length > 0) this.setEchart(c, ei);
-        // if (e.children) console.log(e.children)
-      });
-      this.$emit("updateParent", "loading", false);
-      }
+        if (res.success) {
+          res.data.forEach((e, ei) => {
+            let c = e.dataList || [];
+            c.map(ci => {
+              ci.name = ci.yslx_name || ci.scxname;
+              ci.value = this.compute(ci.mj);
+              ci.id = ci.yslx || ci.scxbsm;
+              ci.geom = ci.geom || (ci.data ? ci.data.geom : "");
+              // ci.label = ci.mc_name;
+            });
+            this.echarts.push({
+              id: e.scxbsm,
+              label: e.scxname,
+              children: c,
+              lchildren: e.children || [],
+              iseyes: false,
+              isshow: false
+            });
+            if (c.length > 0) this.setEchart(c, ei);
+            // if (e.children) console.log(e.children)
+          });
+          this.$emit("updateParent", "loading", false);
+        }
       });
     },
     eyesChaneg(i) {

File diff suppressed because it is too large
+ 0 - 10
static/data/ghss/data.js


Some files were not shown because too many files changed in this diff