From 69016295399fff1c92b54c4656ad96270298dadd Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期五, 02 四月 2021 17:55:37 +0800
Subject: [PATCH] 修改废水统计报表
---
src/components/panel/topicSearch/WaterWasteSearch.vue | 128 +++++++++++++++++++++++++++++++-----------
src/components/table/components/WasteWater.vue | 2
2 files changed, 96 insertions(+), 34 deletions(-)
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 59f9330..340ce3e 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -23,42 +23,104 @@
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
</el-form>
- <div>
- <el-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">
- <div v-if="total > 3">
- {{ item.CompanyName }}
+ <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>-->
+<!-- <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>-->
+<!-- <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>
</div>
</template>
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index 3291fb1..af191ce 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -82,7 +82,7 @@
width="200"
trigger="click"
popper-class="popovers"
- title="XXX1鏄庣粏琛�"
+ title="鐩戞祴鐐规槑缁嗚〃"
>
<refinery></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
--
Gitblit v1.8.0