feat: 取消无效判断

f267e11c · heshihao · ad9fd24d · f267e11c · f267e11c
Commit f267e11c authored Nov 01, 2023 by heshihao
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 38 deletions

src/views/atlas/pages/enterprise.vue
+15 -22

src/views/radar/pages/chart.vue
+13 -16

No files found.
--- a/src/views/atlas/pages/enterprise.vue
+++ b/src/views/atlas/pages/enterprise.vue
@@ -133,7 +133,7 @@
          </p>
        </div> -->
        <ul class="Industrial-chain">
-          <li :class="['top_chain', industry_id == 2 ? 'have' : '']">
+          <li :class="['top_chain', industry_id == 999 ? 'have' : '']">
            <div class="chain_head">上游</div>
            <el-collapse accordion>
@@ -143,7 +143,7 @@
                    @click="getProduct(item.node, item.node)"
                    :class="willIndustry == item.node ? 'title_active' : ''"
                  >
-                    {{ item.node + "(" + item.company_count + ")" }}
+                    {{ item.node }}
                  </div>
                </template>
                <ul>
@@ -153,7 +153,7 @@
                    @click="getProduct(itemx.node, itemx.node)"
                    :class="willIndustry == itemx.node ? 'text_active' : ''"
                  >
-                    {{ itemx.node + "(" + itemx.company_count + ")" }}
+                    {{ itemx.node }}
                    <i
                      class="el-icon-arrow-right"
                      v-if="itemx.subNodeList.length > 0"
@@ -166,7 +166,7 @@
                        @click.stop="getProduct(items.node, items.node, itemx.node)"
                        :class="willIndustry == items.node ? 'text_active' : ''"
                      >
-                        {{ items.node + "(" + items.company_count + ")" }}
+                        {{ items.node }}
                      </li>
                    </ul>
                  </li>
@@ -183,7 +183,7 @@
            </div> -->
            </el-collapse>
          </li>
-          <li :class="['center_chain', industry_id == 2 ? 'have' : '']">
+          <li :class="['center_chain', industry_id == 999 ? 'have' : '']">
            <div class="chain_head">中游</div>
            <el-collapse accordion>
              <el-collapse-item v-for="(item, index) in midstream.subNodeList" :key="index">
@@ -192,7 +192,7 @@
                    @click="getProduct(item.node, item.node)"
                    :class="willIndustry == item.node ? 'title_active' : ''"
                  >
-                    {{ item.node + "(" + item.company_count + ")" }}
+                    {{ item.node }}
                    <!-- ({{ item.count }}) -->
                  </div>
                </template>
@@ -203,7 +203,7 @@
                    @click="getProduct(itemx.node, itemx.node)"
                    :class="willIndustry == itemx.node ? 'text_active' : ''"
                  >
-                    {{ itemx.node + "(" + itemx.company_count + ")" }}
+                    {{ itemx.node }}
                    <i
                      class="el-icon-arrow-right"
                      v-if="itemx.subNodeList.length > 0"
@@ -216,7 +216,7 @@
                        @click.stop="getProduct(items.node, items.node, itemx.node)"
                        :class="willIndustry == items.node ? 'text_active' : ''"
                      >
-                        {{ items.node + "(" + items.company_count + ")" }}
+                        {{ items.node }}
                      </li>
                    </ul>
                  </li>
@@ -224,7 +224,7 @@
              </el-collapse-item>
            </el-collapse>
          </li>
-          <li :class="['bottom_chain', industry_id == 2 ? 'have' : '']">
+          <li :class="['bottom_chain', industry_id == 999 ? 'have' : '']">
            <div class="chain_head">下游</div>
            <el-collapse accordion>
              <el-collapse-item v-for="(item, index) in downstream.subNodeList" :key="index">
@@ -233,8 +233,7 @@
                    @click="getProduct(item.node, item.node)"
                    :class="willIndustry == item.node ? 'title_active' : ''"
                  >
-                    {{ item.node + "(" + item.company_count + ")" }}
+                    {{ item.node }}
-                    <!-- ({{ item.count }}) -->
                  </div>
                </template>
                <ul>
@@ -244,7 +243,7 @@
                    @click="getProduct(itemx.node, itemx.node)"
                    :class="willIndustry == itemx.node ? 'text_active' : ''"
                  >
-                    {{ itemx.node + "(" + itemx.company_count + ")" }}
+                    {{ itemx.node }}
                    <i
                      class="el-icon-arrow-right"
                      v-if="itemx.subNodeList.length > 0"
@@ -257,7 +256,7 @@
                        @click.stop="getProduct(items.node, items.node, itemx.node)"
                        :class="willIndustry == items.node ? 'text_active' : ''"
                      >
-                        {{ items.node + "(" + items.company_count + ")" }}
+                        {{ items.node }}
                      </li>
                    </ul>
                  </li>
@@ -488,13 +487,8 @@ export default {
    industry_id(nv, ov) {
      this.page = 1;
      this.product = "";
-      if (this.industry_id == 2) {
-        this.activeChain = "光通讯";
+      this.getChain(this.industry_name);
-        this.getChain(this.activeChain);
-      } else {
-        this.activeChain = "";
-        this.getChain(this.industry_name);
-      }
      this.getEPList();
      this.getIndustryCollect();
      this.getAttractMap();
@@ -526,8 +520,7 @@ export default {
      });
    }
    if (this.industry_id == 2) {
-      this.activeChain = "光通讯";
+      this.getChain(this.industry_name);
-      this.getChain(this.activeChain);
    } else {
      this.getChain(this.industry_name);
    }

--- a/src/views/radar/pages/chart.vue
+++ b/src/views/radar/pages/chart.vue
@@ -153,7 +153,7 @@
    </div>
    <div class="dialog_box">
      <el-dialog title="请选择产业" :visible.sync="showDialog">
-        <div class="card" v-if="industry_id == 2">
+        <!-- <div class="card" v-if="industry_id == 2">
          <p :class="[activeChain == '光通讯' ? 'active' : '']" @click="changeChain('光通讯')">
            光通讯
          </p>
@@ -166,7 +166,7 @@
          <p :class="[activeChain == '工业机器人' ? 'active' : '']" @click="changeChain('工业机器人')">
            工业机器人
          </p>
-        </div>
+        </div> -->
        <ul class="Industrial-chain">
          <li class="top_chain">
            <div class="chain_head">上游</div>
@@ -177,7 +177,7 @@
                    @click="getProduct(item.node, item.node)"
                    :class="willIndustry == item.node ? 'title_active' : ''"
                  >
-                    {{ item.node + "(" + item.enterprise_count + ")" }}
+                    {{ item.node }}
                  </div>
                </template>
                <ul>
@@ -187,7 +187,7 @@
                    @click="getProduct(itemx.node, itemx.node)"
                    :class="willIndustry == itemx.node ? 'text_active' : ''"
                  >
-                    {{ itemx.node + "(" + itemx.enterprise_count + ")" }}
+                    {{ itemx.node }}
                    <i
                      class="el-icon-arrow-right"
                      v-if="itemx.subNodeList.length > 0"
@@ -200,7 +200,7 @@
                        @click.stop="getProduct(items.node, items.node, itemx.node)"
                        :class="willIndustry == items.node ? 'text_active' : ''"
                      >
-                        {{ items.node + "(" + items.enterprise_count + ")" }}
+                        {{ items.node }}
                      </li>
                    </ul>
                  </li>
@@ -226,7 +226,7 @@
                    @click="getProduct(item.node, item.node)"
                    :class="willIndustry == item.node ? 'title_active' : ''"
                  >
-                    {{ item.node + "(" + item.enterprise_count + ")" }}
+                    {{ item.node }}
                    <!-- ({{ item.count }}) -->
                  </div>
                </template>
@@ -237,7 +237,7 @@
                    @click="getProduct(itemx.node, itemx.node)"
                    :class="willIndustry == itemx.node ? 'text_active' : ''"
                  >
-                    {{ itemx.node + "(" + itemx.enterprise_count + ")" }}
+                    {{ itemx.node }}
                    <i
                      class="el-icon-arrow-right"
                      v-if="itemx.subNodeList.length > 0"
@@ -250,7 +250,7 @@
                        @click.stop="getProduct(items.node, items.node, itemx.node)"
                        :class="willIndustry == items.node ? 'text_active' : ''"
                      >
-                        {{ items.node + "(" + items.enterprise_count + ")" }}
+                        {{ items.node }}
                      </li>
                    </ul>
                  </li>
@@ -267,7 +267,7 @@
                    @click="getProduct(item.node, item.node)"
                    :class="willIndustry == item.node ? 'title_active' : ''"
                  >
-                    {{ item.node + "(" + item.enterprise_count + ")" }}
+                    {{ item.node }}
                    <!-- ({{ item.count }}) -->
                  </div>
                </template>
@@ -278,7 +278,7 @@
                    @click="getProduct(itemx.node, itemx.node)"
                    :class="willIndustry == itemx.node ? 'text_active' : ''"
                  >
-                    {{ itemx.node + "(" + itemx.enterprise_count + ")" }}
+                    {{ itemx.node }}
                    <i
                      class="el-icon-arrow-right"
                      v-if="itemx.subNodeList.length > 0"
@@ -291,7 +291,7 @@
                        @click.stop="getProduct(items.node, items.node, itemx.node)"
                        :class="willIndustry == items.node ? 'text_active' : ''"
                      >
-                        {{ items.node + "(" + items.enterprise_count + ")" }}
+                        {{ items.node }}
                      </li>
                    </ul>
                  </li>
@@ -367,8 +367,7 @@ export default {
        if (this.industry_id == 2) {
          this.product = "";
          this.willIndustry = "";
-          this.activeChain = "光通讯";
+          this.getChain();
-          this.getChain(this.activeChain);
        } else {
          this.activeChain = "";
          this.getChain();
@@ -385,8 +384,7 @@ export default {
      if (this.industry_id == 2) {
        this.product = "";
        this.willIndustry = "";
-        this.activeChain = "光通讯";
+        this.getChain();
-        this.getChain(this.activeChain);
      } else {
        this.activeChain = "";
        this.getChain();
@@ -429,7 +427,6 @@ export default {
    },
    async getChain(id) {
      let res = await API2.chain(id ? id : this.industry_name, 2);
-      console.log(res);
      this.IndustrialChain = res;
      this.upstream = this.IndustrialChain.nodeList[0];
      this.midstream = this.IndustrialChain.nodeList[1];