Startsida Utforska Hjälp
Registrera dig Logga in
ZHOU
/
yunsu
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

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

“ 5 år sedan
förälder
31830d3ae6 b22064fe90
incheckning
944ea00d6e
2 ändrade filer med 152 tillägg och 16 borttagningar
Delad Vy Visa Diff Statistik
  1. 98 0
      ys_vue/invite.html
  2. 54 16
      ys_vue/src/views/message.vue

+ 98 - 0
ys_vue/invite.html
Visa fil 

@@ -0,0 +1,98 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+    <title>邀请</title>
 
+    <style>
 
+        * {
 
+            font-family: 'Microsoft YaHei', '微软雅黑', '黑体';
 
+            margin: 0;
 
+            padding: 0;
 
+        }
 
+        .main {
 
+            margin: 80px auto;
 
+            width: 300px;
 
+            color: #555;
 
+        }
 
+        .title{
 
+            text-align: center;
 
+            font-size: 20px;
 
+            color: #999;
 
+            line-height: 50px;
 
+            border-bottom:#DDD 1px solid;
 
+            margin-bottom:5px;
 
+            padding: 0 10px;
 
+        }
 
+        .impoortant{
 
+            color: #1E72FF;
 
+        }
 
+        .hello{
 
+            line-height: 40px;
 
+            padding: 0 10px;
 
+        }
 
+        .invite{
 
+            line-height: 22px;
 
+            padding: 0 10px;
 
+        }
 
+        .info{
 
+            background-color: #EEE;
 
+            margin: 20px 0;
 
+            padding: 10px;
 
+            border-radius: 3px;
 
+        }
 
+        .info1{
 
+            padding-left: 10px;
 
+            border-left:#1E72FF 1px solid;
 
+            line-height: 18px;
 
+        }
 
+        .info2{
 
+            line-height: 20px;
 
+            padding: 10px 0;
 
+        }
 
+        .info3{
 
+            line-height: 20px;
 
+        }
 
+        .info2 span{
 
+            position:relative;
 
+            left: 40px;
 
+            color:#999;
 
+        }
 
+        .info3 span{
 
+            position:relative;
 
+            left: 25px;
 
+            color:#999;
 
+        }
 
+        button{
 
+            background-color: #1E72FF;
 
+            border: 0;
 
+            color: white;
 
+            border-radius: 5px;
 
+            width: 100%;
 
+            height: 40px;
 
+        }
 
+    </style>
 
+    <script>
 
+        function join(){
 
+            console.log("点击了立即加入，但什么都没有发生");
 
+        }
 
+    </script>
 
+</head>
 
+
 
+<body>
 
+    <div class="main">
 
+        <div class="title">云模管理平台</div>
 
+        <p class="hello">王二小您好！</p>
 
+        <p class="invite">陈晨 邀您参与 <span class="impoortant">南京火石闪信网络公司</span>的<span class="impoortant">face水杯</span>项目</p>
 
+        <div class="info">
 
+            <p class="info1">您的账户信息</p>
 
+            <p class="info2">手机号<span>16651112436</span></p>
 
+            <p class="info3">初始密码<span>000000</span></p>
 
+        </div>
 
+        <button onclick="join()">立即加入</button>
 
+    </div>
 
+</body>
 
+
 
+</html>

+ 54 - 16
ys_vue/src/views/message.vue
Visa fil 

@@ -4,23 +4,53 @@
 
     <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
 
       <el-form :inline="true">
 
         <el-col :span="2">
 
-          <el-form-item>全部消息</el-form-item>
 
+          <el-form-item>消息中心</el-form-item>
 
         </el-col>
 
       </el-form>
 
     </el-col>
 
-    <div class="message-div" v-for="item in messages">
 
-      <p>
 
-        <span class="message-type" v-if="item.noticeType == 0">【审批】</span>
 
-        <span class="message-type" v-else-if="item.noticeType == 1">【警告】</span>
 
-        <span class="message-type" v-else-if="item.noticeType == 2">【保养】</span>
 
-        <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>
 
+
 
+    <!--选项卡-->
 
+    <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>
 
+        </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>
 
+        </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>
 
+        </el-tab-pane>
 
+      </el-tabs>
 
+    </el-col>
 
+
 
     <!--工具条-->
 
     <el-col :span="24" class="toolbar">
 
       <el-pagination
 
@@ -45,7 +75,8 @@ export default {
 
       page: 1,
 
       size: 20,
 
       total: 0,
 
-      tableHeight: 0
 
+      tableHeight: 0,
 
+      activePage: 0
 
     };
 
   },
 
   methods: {
 
@@ -58,6 +89,10 @@ export default {
 
       this.size = val;
 
       this.loadNotice();
 
     },
 
+    //标签页面切换时
 
+    handleClick(tab, event) {
 
+      this.activeTab = tab.name;
 
+    },
 
     //读取消息提示
 
     loadNotice() {
 
       this.http.post(
 
@@ -68,7 +103,10 @@ export default {
 
         },
 
         res => {
 
           if (res.code == "ok") {
 
-            this.messages = res.data.list.list;
 
+            this.messages = [];
 
+            this.messages.push(res.data[0].emergencyList.list);
 
+            this.messages.push(res.data[1].emergencyList.list);
 
+            this.messages.push(res.data[2].emergencyList.list);
 
           } else {
 
             this.$message({
 
               message: res.msg,