From fc731768b2e18c0e5e3094ca50d09abe3f08717f Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 13 五月 2021 14:51:07 +0800
Subject: [PATCH] 修改分页

---
 src/components/table/components/WasteWater.vue |  110 ++++++++++++------------------------------------------
 1 files changed, 25 insertions(+), 85 deletions(-)

diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index c8ad3dd..a4c51fd 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -1,82 +1,43 @@
 <template>
    <div class="waste-water">
-           <el-table
-                   class="tableBox"
-                   :data="tableData"
-                   @cell-click="handle"
-           >
-               <el-table-column
-                       width="30px"
-                        label=""
-               >
+           <el-table class="tableBox" :data="tableData" style="width: 100%" @cell-click="handle">
+               <el-table-column width="30px" label="">
                  <template slot-scope="{row,$index}">
 <!--                   <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
-                 <el-popover
-                         placement="bottom"
-                         trigger="click"
-                         :disabled="!isShowIcon"
-                             popper-class="popovers"
-                        >
+                 <el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
                    <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
                    <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
 <!--                   <i class="el-icon-caret-bottom"   slot="reference" v-else @click="doIcon($index)"></i>-->
                  </el-popover>
                    </template>
                </el-table-column>
-               <el-table-column
-                       label="搴忓彿"
-                       width="45px"
-                       type="index">
-               </el-table-column>
-               <el-table-column
-                       prop="UserName"
-                       label="浼佷笟鍚嶇О"
-                       width="120px">
+               <el-table-column label="搴忓彿" width="45px" type="index"></el-table-column>
+               <el-table-column prop="UserName" label="浼佷笟鍚嶇О" >
                  <template slot-scope="scope">
                    <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
                    <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
                    <div v-else >{{scope.row.UserName}}</div>
                  </template>
                </el-table-column>
-               <el-table-column prop="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�"></el-table-column>
-               <el-table-column label="COD  (t)">
-                   <el-table-column
-                           prop="AddOutPut"
-                           label="绱浜х敓閲�"
-                           width="70px">
-                   </el-table-column>
-                   <el-table-column
-                               prop="MonthOutPut"
-                               label="褰撴湀鐢熶骇閲�"
-                               width="70px">
-                   </el-table-column>
+               <el-table-column prop="WasteWaters" width="80">
+                   <div slot="header">
+                      <span>澶栨帓搴熸按閲�</span>
+                       <div>锛坢鲁锛�</div>
+                   </div>
                </el-table-column>
-               <el-table-column label="姘ㄦ爱  (t)">
-                   <el-table-column
-                           prop="NH4NPut"
-                           label="绱浜х敓閲�"
-                           width="70px">
-                   </el-table-column>
-                   <el-table-column
-                           prop="NH4NMonth"
-                           label="褰撴湀鐢熶骇閲�"
-                           width="70px">
-                   </el-table-column>
+               <el-table-column label="COD  (浜х敓閲�/t)">
+                   <el-table-column prop="AddOutPut" label="绱" width="70"></el-table-column>
+                   <el-table-column prop="MonthOutPut" label="褰撴湀" width="70"></el-table-column>
                </el-table-column>
-               <el-table-column label="鎺掓斁鍙f娴嬬粺璁$姸鎬�">
-                   <el-table-column
-                           prop="normal"
-                           label="姝e父"
-                           width="60px">
+               <el-table-column label="姘ㄦ爱  (浜х敓閲�/t)">
+                   <el-table-column prop="NH4NPut" label="绱" width="70"></el-table-column>
+                   <el-table-column prop="NH4NMonth" label="褰撴湀" width="70"></el-table-column>
+               </el-table-column>
+               <el-table-column label="鎺掓斁鍙f娴嬬粺璁$姸鎬� (涓�)">
+                   <el-table-column prop="normal" label="姝e父" width="60">
                      <template slot-scope="{row,$index}">
                        <u v-if="$index!=2" >{{row.normal}}</u>
-                       <el-popover v-else
-                           placement="bottom-end"
-                           width="200"
-                           trigger="click"
-                                   popper-class="popovers"
-                           title="鐩戞祴鐐规槑缁嗚〃"
-                       >
+                       <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
                          <refinery></refinery>
                          <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                          <!--                       <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
@@ -85,34 +46,13 @@
                        </el-popover>
                      </template>
                    </el-table-column>
-                   <el-table-column
-                           prop="overProof"
-                           label="瓒呮爣"
-                           width="60px">
-                   </el-table-column>
-                   <el-table-column
-                           prop="Abnormal"
-                           label="寮傚父"
-                           width="60px">
-                   </el-table-column>
-                   <el-table-column
-                           prop="StopProduction"
-                           label="鍋滀骇"
-                           width="60px">
-                   </el-table-column>
-                   <el-table-column
-                           prop="deficiency"
-                           label="缂哄け"
-                           width="60px">
+                   <el-table-column prop="overProof" label="瓒呮爣" width="60"></el-table-column>
+                   <el-table-column prop="Abnormal" label="寮傚父" width="60"></el-table-column>
+                   <el-table-column prop="StopProduction" label="鍋滀骇" width="60"></el-table-column>
+                   <el-table-column prop="deficiency" label="缂哄け" width="60">
                      <template slot-scope="{row,$index}">
                        <u v-if="$index!=1" >{{row.deficiency}}</u>
-                       <el-popover v-else
-                                   placement="bottom-end"
-                                   width="200"
-                                   trigger="click"
-                                   title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�"
-                                   popper-class="popovers"
-                       >
+                       <el-popover v-else placement="bottom-end" trigger="click" title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�" popper-class="popovers">
                          <MissingAlarm></MissingAlarm>
                          <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
                        </el-popover>

--
Gitblit v1.8.0