通知再次修改

ys_vue/src/views/Home.vue

@@ -435,8 +435,8 @@ export default {
         res => {
           if (res.code == "ok") {
             this.popoverData = [];
-            this.popoverData.push(res.data[0].emergencyList.list);
-            this.popoverData.push(res.data[1].emergencyList.list);
+            this.popoverData.push(res.data[0].approvelList.list);
+            this.popoverData.push(res.data[1].matainList.list);
             this.popoverData.push(res.data[2].emergencyList.list);
             this.unreadCount = [];
             this.unreadCount.push(res.data[0].isNotReadCount);

ys_vue/src/views/message.vue

@@ -10,7 +10,7 @@
     </el-col>
 
     <!--选项卡-->
-    <el-col :span="24">
+    <el-col :span="24" >
       <el-tabs v-model="activePage" @tab-click="handleClick" type="card">
         <el-tab-pane name="0" label="审批">
           <div class="message-div" v-for="item in messages[0]">
@@ -23,6 +23,18 @@
             </p>
             <p class="message-article">{{item.content}}</p>
           </div>
+          <!--分页1-->
+          <el-col :span="24" class="toolbar">
+            <el-pagination
+              @size-change="handleSizeChange0"
+              @current-change="handleCurrentChange0"
+              :page-sizes="[20 , 50 , 80 , 100 , 200]"
+              :page-size="20"
+              layout="total, sizes, prev, pager, next"
+              :total="total[0]"
+              style="float:right;"
+            ></el-pagination>
+          </el-col>
         </el-tab-pane>
         <el-tab-pane name="1" label="警告">
           <div class="message-div" v-for="item in messages[1]">
@@ -35,6 +47,18 @@
             </p>
             <p class="message-article">{{item.content}}</p>
           </div>
+          <!--分页2-->
+          <el-col :span="24" class="toolbar">
+            <el-pagination
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"
+              :page-sizes="[20 , 50 , 80 , 100 , 200]"
+              :page-size="20"
+              layout="total, sizes, prev, pager, next"
+              :total="total[1]"
+              style="float:right;"
+            ></el-pagination>
+          </el-col>
         </el-tab-pane>
         <el-tab-pane name="2" label="保养">
           <div class="message-div" v-for="item in messages[2]">
@@ -47,22 +71,21 @@
             </p>
             <p class="message-article">{{item.content}}</p>
           </div>
+          <!--分页3-->
+          <el-col :span="24" class="toolbar">
+            <el-pagination
+              @size-change="handleSizeChange2"
+              @current-change="handleCurrentChange2"
+              :page-sizes="[20 , 50 , 80 , 100 , 200]"
+              :page-size="20"
+              layout="total, sizes, prev, pager, next"
+              :total="total[2]"
+              style="float:right;"
+            ></el-pagination>
+          </el-col>
         </el-tab-pane>
       </el-tabs>
     </el-col>
-
-    <!--工具条-->
-    <el-col :span="24" class="toolbar">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[20 , 50 , 80 , 100 , 200]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-        style="float:right;"
-      ></el-pagination>
-    </el-col>
   </section>
 </template>
 
@@ -72,20 +95,41 @@ export default {
   data() {
     return {
       messages: [],
-      page: 1,
+      page0: 1,
+      page1: 1,
+      page2: 1,
       size: 20,
-      total: 0,
+      total: [0, 0, 0],
       tableHeight: 0,
-      activePage: 0
+      activePage: 0,
+      heightString: ""
     };
   },
   methods: {
-    //分页
-    handleCurrentChange(val) {
+    //分页1
+    handleCurrentChange0(val) {
+      this.page0 = val;
+      this.loadNotice();
+    },
+    handleSizeChange0(val) {
+      this.size1 = val;
+      this.loadNotice();
+    },
+    //分页2
+    handleCurrentChange1(val) {
+      this.page2 = val;
+      this.loadNotice();
+    },
+    handleSizeChange1(val) {
+      this.size = val;
+      this.loadNotice();
+    },
+    //分页3
+    handleCurrentChange2(val) {
       this.page = val;
       this.loadNotice();
     },
-    handleSizeChange(val) {
+    handleSizeChange2(val) {
       this.size = val;
       this.loadNotice();
     },
@@ -104,9 +148,12 @@ export default {
         res => {
           if (res.code == "ok") {
             this.messages = [];
-            this.messages.push(res.data[0].emergencyList.list);
-            this.messages.push(res.data[1].emergencyList.list);
+            this.messages.push(res.data[0].approvelList.list);
+            this.messages.push(res.data[1].matainList.list);
             this.messages.push(res.data[2].emergencyList.list);
+            this.total[0] = res.data[0].approvelList.total;
+            this.total[1] = res.data[1].matainList.total;
+            this.total[2] = res.data[2].emergencyList.total;
           } else {
             this.$message({
               message: res.msg,
@@ -160,6 +207,7 @@ export default {
   created() {
     let height = window.innerHeight;
     this.tableHeight = height - 260;
+    this.heightString = "height: " + this.tableHeight;
   },
   mounted() {
     this.loadNotice();