Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-04-07 f3f693a10d00b75f1eafe7f029cbd99bd3c9825b

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -29,16 +29,17 @@
          <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
        </div>
      </el-form>
      <el-card class="box-card"
               v-for="(item,index) in searchDataDisplay"
               :key="index">
        <div>
          {{ item.CompanyName }}
        </div>
      </el-card>
    </div>
    <!--      <el-scrollbar style="height:100%">-->
    <!--      </el-scrollbar>-->
    <el-scrollbar style="height:286.22px">
      <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index" ><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
          <p>所属部门：<span>炼化部</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
    </el-scrollbar>
  </div>
</template>

@@ -128,6 +129,7 @@
        // 数据的传递
        transferData: ''
      },
      // 数据搜索之后，存储数据的
      searchDataDisplay: []
    }
  },