Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/message.vue

@@ -10,18 +10,20 @@
     </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]">
-            <p>
-              <span
-                class="message-title"
-                @click="locationHerf(item.refId, item.noticeType)"
-              >{{item.projectName}}</span>
-              <span class="message-time">{{item.indate}}</span>
-            </p>
-            <p class="message-article">{{item.content}}</p>
+          <div :style="heightString">
+            <div class="message-div" v-for="item in messages[0]">
+              <p>
+                <span
+                  class="message-title"
+                  @click="locationHerf(item.refId, item.noticeType)"
+                >{{item.projectName}}</span>
+                <span class="message-time">{{item.indate}}</span>
+              </p>
+              <p class="message-article">{{item.content}}</p>
+            </div>
           </div>
           <!--分页1-->
           <el-col :span="24" class="toolbar">
@@ -37,15 +39,17 @@
           </el-col>
         </el-tab-pane>
         <el-tab-pane name="1" label="警告">
-          <div class="message-div" v-for="item in messages[1]">
-            <p>
-              <span
-                class="message-title"
-                @click="locationHerf(item.refId, item.noticeType)"
-              >{{item.projectName}}</span>
-              <span class="message-time">{{item.indate}}</span>
-            </p>
-            <p class="message-article">{{item.content}}</p>
+          <div :style="heightString">
+            <div class="message-div" v-for="item in messages[1]">
+              <p>
+                <span
+                  class="message-title"
+                  @click="locationHerf(item.refId, item.noticeType)"
+                >{{item.projectName}}</span>
+                <span class="message-time">{{item.indate}}</span>
+              </p>
+              <p class="message-article">{{item.content}}</p>
+            </div>
           </div>
           <!--分页2-->
           <el-col :span="24" class="toolbar">
@@ -61,15 +65,17 @@
           </el-col>
         </el-tab-pane>
         <el-tab-pane name="2" label="保养">
-          <div class="message-div" v-for="item in messages[2]">
-            <p>
-              <span
-                class="message-title"
-                @click="locationHerf(item.refId, item.noticeType)"
-              >{{item.projectName}}</span>
-              <span class="message-time">{{item.indate}}</span>
-            </p>
-            <p class="message-article">{{item.content}}</p>
+          <div :style="heightString">
+            <div class="message-div" v-for="item in messages[2]">
+              <p>
+                <span
+                  class="message-title"
+                  @click="locationHerf(item.refId, item.noticeType)"
+                >{{item.projectName}}</span>
+                <span class="message-time">{{item.indate}}</span>
+              </p>
+              <p class="message-article">{{item.content}}</p>
+            </div>
           </div>
           <!--分页3-->
           <el-col :span="24" class="toolbar">
@@ -207,7 +213,7 @@ export default {
   created() {
     let height = window.innerHeight;
     this.tableHeight = height - 260;
-    this.heightString = "height: " + this.tableHeight;
+    this.heightString = "height: " + this.tableHeight + "px";
   },
   mounted() {
     this.loadNotice();