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

yangdelong

2021-04-07 f3f693a10d00b75f1eafe7f029cbd99bd3c9825b

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -23,105 +23,17 @@
                    <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
                </div>
            </el-form>
            <el-scrollbar style="height:300px">
                <div class="environmental-risk-list" ><!-- 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>
                <div class="environmental-risk-list" ><!-- 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>
                <div class="environmental-risk-list" ><!-- 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>
                <div class="environmental-risk-list" ><!-- 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>
                <div class="environmental-risk-list" ><!-- 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>
                <div class="environmental-risk-list" ><!-- 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>
<!--                <el-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">-->
<!--                    <div v-if="total > 3">-->
<!--                        {{ item.CompanyName }}-->
<!--                    </div>-->
<!--                </el-card>-->
                <el-card class="footer-page" v-if="total > 10">
                    <el-pagination
                            small
                            @current-change="handlePage"
                            :page-size=pageSize
                            layout="prev, pager, next"
                            :total=total
                            :current-page=current
                            class="warnPagination"
                    >
                    </el-pagination>
                </el-card>
<!--                        <el-pagination-->
<!--                            small-->
<!--                            layout="prev, pager, next"-->
<!--                            :total=total-->
<!--                            :current-page=1-->
<!--                            class="warnPagination"-->
<!--                        >-->
<!--                        </el-pagination>-->
            </div>
<!--                      <el-scrollbar style="height:100%">-->
<!--                      <el-card class="footer-page">-->
<!--                        <ul>-->
<!--                          {{ searchDataDisplay }}-->
<!--                          <li v-for="(item,index) in searchDataDisplay" :key="index">-->
<!--                            {{ item.CompanyName }}-->
<!--                          </li>-->
<!--                        </ul>-->
<!--                      </el-card>-->
<!--                          <el-pagination-->
<!--                              small-->
<!--                              @current-change="handlePage"-->
<!--                              :page-size=pageSize-->
<!--                              layout="prev, pager, next"-->
<!--                              :total=total-->
<!--                              :current-page=current-->
<!--                              class="warnPagination"-->
<!--                          >-->
<!--                          </el-pagination>-->
<!--                      </el-card>-->
<!--                      </el-scrollbar>-->
        </div>
        <el-scrollbar style="height:264px">
            <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>