diff --git a/src/views/Service/chat/index.vue b/src/views/Service/chat/index.vue
index f25b73e6dea7781c4a3703fbe53df236a83aa885..b943a0975061aa5d58724ad2264b492389f5e4ea 100644
--- a/src/views/Service/chat/index.vue
+++ b/src/views/Service/chat/index.vue
@@ -1,67 +1,70 @@
 <template>
   <section>
-    <div class="leftDiv">
-      <ul class="infinite-list">
-        <li class="infinite-list-head">
-          <img :src="userInfo.headImg"/>{{ userInfo.name }}
-        </li>
-        <li v-for="item in friends" :key="item.id" @click="chat(item)" class="infinite-list-item">
-          <img :src="item.headImg"/>{{ item.name }}
-        </li>
-      </ul>
-    </div>
-    <div class="chat-div">
-      <div class="chat-title"><span>{{ current.name }}</span></div>
-      <hr/>
-      <div class="news">
-        <template v-for="(item,index) in sendMessage">
-          <!--时间/通知等-->
-          <div v-if="item.msgType === '10'" class="chat-notice">
-            <span>{{ timeFormat(item.sendTime) }}</span>
-          </div>
+    <div class="chat-section">
+      <div class="leftDiv">
+        <ul class="infinite-list">
+          <li class="infinite-list-head">
+            <img :src="userInfo.headImg"/>{{ userInfo.name }}
+          </li>
+          <li v-for="item in friends" :key="item.id" @click="chat(item)" class="infinite-list-item">
+            <img :src="item.headImg"/>{{ item.name }}
+          </li>
+        </ul>
+      </div>
+      <div class="chat-div">
+        <div class="chat-title"><span>{{ current.name }}</span></div>
+        <hr/>
+        <div class="news">
+          <template v-for="(item,index) in sendMessage">
+            <!--时间/通知等-->
+            <div v-if="item.msgType === '10'" class="chat-notice">
+              <span>{{ timeFormat(item.sendTime) }}</span>
+            </div>
 
-          <!-- 发送的消息 -->
-          <div v-if="item.sendUser === userInfo.id" class="chat-receiver">
-            <div><img :src="userInfo.headImg"/></div>
-            <div>{{ userInfo.name }}</div>
-            <div>
-              <div class="chat-right_triangle"></div>
-              <span> {{ item.msg }} </span>
+            <!-- 发送的消息 -->
+            <div v-if="item.sendUser === userInfo.id" class="chat-receiver">
+              <div><img :src="userInfo.headImg"/></div>
+              <div>{{ userInfo.name }}</div>
+              <div>
+                <div class="chat-right_triangle"></div>
+                <span> {{ item.msg }} </span>
+              </div>
             </div>
-          </div>
 
-          <!-- 接收的消息 -->
-          <div v-if="item.acceptUser === userInfo.id" class="chat-sender">
-            <div><img :src="current.headImg"/></div>
-            <div>{{ current.name }}</div>
-            <div>
-              <div class="chat-left_triangle"></div>
-              <span> {{ item.msg }} </span>
+            <!-- 接收的消息 -->
+            <div v-if="item.acceptUser === userInfo.id" class="chat-sender">
+              <div><img :src="current.headImg"/></div>
+              <div>{{ current.name }}</div>
+              <div>
+                <div class="chat-left_triangle"></div>
+                <span> {{ item.msg }} </span>
+              </div>
             </div>
-          </div>
-        </template>
-      </div>
-      <hr/>
-      <div>
-        <div class="expression">
-          <!--表情-->
-          <el-popover placement="top" width="320" trigger="click">
+          </template>
+        </div>
+        <hr/>
+        <div>
+          <div class="expression">
+            <!--表情-->
+            <el-popover placement="top" width="320" trigger="click">
             <span v-for="index in 70" :key="index">
-              <img class="expression-emjio" @click="selectEmjio(index)" :src="require('@/assets/img/emjio/'+index +'.png')"/>
+              <img class="expression-emjio" @click="selectEmjio(index)"
+                   :src="require('@/assets/img/emjio/'+index +'.png')"/>
             </span>
-            <i slot="reference" class="iconfont icon-smiling"></i>
-          </el-popover>
-          <i class="iconfont icon-wenjian"></i>
-        </div>
-        <div class="send-message">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            class="send-textarea"
-            v-model="content">
-          </el-input>
-          <span><el-button type="primary" class="send-but" @click="sendBut">发 送</el-button></span>
+              <i slot="reference" class="iconfont icon-smiling"></i>
+            </el-popover>
+            <i class="iconfont icon-wenjian"></i>
+          </div>
+          <div class="send-message">
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              class="send-textarea"
+              v-model="content">
+            </el-input>
+            <span><el-button type="primary" class="send-but" @click="sendBut">发 送</el-button></span>
+          </div>
         </div>
       </div>
     </div>
@@ -69,369 +72,374 @@
 </template>
 
 <script>
-  export default {
-    name: "chat",
-    data() {
-      return {
-        friends: [],
-        userInfo: '',   // 当前用户信息
-        current: '',    // 当前聊天对象
-        content: '',    // 内容
-        em: ["惊讶", "难过", "亲亲", "再见", "奋斗", "鄙视", "得意", "坏笑", "调皮", "笑哭", "口吐芬芳", "微笑", "皱眉", "尴尬", "厉害", "吃瓜", "凶狠", "绿帽", "鼓掌", "非洲酋长", "好色", "微笑温暖", "偷笑", "无奈", "疑问", "犯困", "发呆", "有趣", "大哭", "白眼", "衰", "生病", "听歌", "打脸", "摸头", "吐血", "财", "机智", "敲头", "666", "海绵宝宝1", "闭嘴", "可怜", "拒绝", "发火", "害羞1", "无奈流汗", "害羞2", "感动", "胜利", "抓狂", "伤心", "海绵宝宝2", "送爱心", "笑哭2", "晕", "骷髅", "地雷", "击掌", "赞", "握手", "低头", "可爱皱眉", "气爆炸", "呕吐", "惊吓", "吓坏", "亲", "心", "玫瑰"],
-        sendMessage: [],  // 存储消息数组
-        websocket: '',
-      }
+export default {
+  name: "chat",
+  data() {
+    return {
+      friends: [],
+      userInfo: '',   // 当前用户信息
+      current: '',    // 当前聊天对象
+      content: '',    // 内容
+      em: ["惊讶", "难过", "亲亲", "再见", "奋斗", "鄙视", "得意", "坏笑", "调皮", "笑哭", "口吐芬芳", "微笑", "皱眉", "尴尬", "厉害", "吃瓜", "凶狠", "绿帽", "鼓掌", "非洲酋长", "好色", "微笑温暖", "偷笑", "无奈", "疑问", "犯困", "发呆", "有趣", "大哭", "白眼", "衰", "生病", "听歌", "打脸", "摸头", "吐血", "财", "机智", "敲头", "666", "海绵宝宝1", "闭嘴", "可怜", "拒绝", "发火", "害羞1", "无奈流汗", "害羞2", "感动", "胜利", "抓狂", "伤心", "海绵宝宝2", "送爱心", "笑哭2", "晕", "骷髅", "地雷", "击掌", "赞", "握手", "低头", "可爱皱眉", "气爆炸", "呕吐", "惊吓", "吓坏", "亲", "心", "玫瑰"],
+      sendMessage: [],  // 存储消息数组
+      websocket: '',
+    }
+  },
+
+  created() {
+    this.getFriends();
+    this.initWebSocket();
+  },
+
+  destroyed() {
+    this.websocket.close();
+  },
+
+  methods: {
+    // 切换对象
+    chat(va) {
+      this.sendMessage = [];
+      this.content = '';
+      this.current = va;
     },
 
-    created() {
-      this.getFriends();
-      this.initWebSocket();
+    initWebSocket() {
+      const wsuri = 'ws://localhost:2020/stu/chat/' + this.userInfo.id;
+      this.websocket = new WebSocket(wsuri);
+      this.websocket.onmessage = this.websocketonmessage;
     },
 
-    destroyed() {
-      this.websocket.close();
+    // 接收数据
+    websocketonmessage(e) {
+      let parse = JSON.parse(e.data);
+      this.sendMessage.push(parse);
     },
 
-    methods: {
-      // 切换对象
-      chat(va) {
-        this.sendMessage = [];
-        this.content = '';
-        this.current = va;
-      },
-
-      initWebSocket() {
-        const wsuri = 'ws://localhost:2020/stu/chat/' + this.userInfo.id;
-        this.websocket = new WebSocket(wsuri);
-        this.websocket.onmessage = this.websocketonmessage;
-      },
-
-      // 接收数据
-      websocketonmessage(e) {
-        let parse = JSON.parse(e.data);
-        this.sendMessage.push(parse);
-      },
-
-      // 数据发送
-      websocketsend(agentData) {
-        this.websocket.send(agentData);
-      },
-
-      // 获取好友列表
-      async getFriends() {
-        this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
-        await this.api.getApi("/chat/friends/get?id=" + this.userInfo.id).then(res => {
-          this.friends = res.data;
-          if (this.friends.length > 0) {
-            this.current = this.friends[0];
-          }
-        })
-      },
-
-      // 发送按钮
-      sendBut() {
-        if (this.content !== '') {
-          // 第一条消息之前加上时间
-          if (this.sendMessage.length === 0) {
-            this.timeAdd();
-          }
-          let msg = {
-            sendUser: this.userInfo.id,
-            acceptUser: this.current.id,
-            msg: this.content,
-            msgType: '',
-            sendType: '',
-            isRead: '1',
-            sendTime: new Date()
-          }
-          // 判断消息类型，发送类型
-          msg.msgType = '1';
-          msg.sendType = '3';
-          this.sendMessage.push(msg);
-          let s = JSON.stringify(msg);
-          this.websocketsend(s);
-          this.content = '';
-        }
-      },
+    // 数据发送
+    websocketsend(agentData) {
+      this.websocket.send(agentData);
+    },
 
-      // 选择表情
-      selectEmjio(value) {
-        let split = this.em[value - 1];
-        let s = this.content + '[' + split + ']';
-        this.content = s;
-      },
+    // 获取好友列表
+    async getFriends() {
+      this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
+      await this.api.getApi("/chat/friends/get?id=" + this.userInfo.id).then(res => {
+        this.friends = res.data;
+        if (this.friends.length > 0) {
+          this.current = this.friends[0];
+        }
+      })
+    },
 
-      // 时间添加
-      timeAdd(){
+    // 发送按钮
+    sendBut() {
+      if (this.content !== '') {
+        // 第一条消息之前加上时间
+        if (this.sendMessage.length === 0) {
+          this.timeAdd();
+        }
         let msg = {
-          sendUser: '',
-          acceptUser: '',
-          msg: '',
-          msgType: '10',
+          sendUser: this.userInfo.id,
+          acceptUser: this.current.id,
+          msg: this.content,
+          msgType: '',
           sendType: '',
-          isRead: '',
+          isRead: '1',
           sendTime: new Date()
         }
+        // 判断消息类型，发送类型
+        msg.msgType = '1';
+        msg.sendType = '3';
         this.sendMessage.push(msg);
-      },
-
-      // 时间判断
-      timeJudgment() {
-        let length = this.sendMessage.length;
-        if (length){
-
-        }
-
-      },
-
-      // 时间格式化
-      timeFormat(te) {
-        let timedate, s, mm, h, d, m, y, time;
-        if (te == '') {
-          return '';
-        } else if (te.length == 10) {
-          time = new Date(te * 1000);
-          y = time.getFullYear();
-          m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
-          d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
-          h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
-          mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
-          s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
-          timedate = y + '年' + m + '月' + d + '日 ' + h + ':' + mm + ':' + s;
-          return timedate;
-        } else {
-          time = new Date(te);
-          y = time.getFullYear();
-          m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
-          d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
-          h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
-          mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
-          s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
-          timedate = y + '年' + m + '月' + d + '日 ' + h + ':' + mm + ':' + s;
-          return timedate;
-        }
+        let s = JSON.stringify(msg);
+        this.websocketsend(s);
+        this.content = '';
       }
+    },
 
-    }
-  }
-</script>
-
-<style scoped>
-
-  /* 左边的列表 */
-  .leftDiv {
-    width: 200px;
-    height: 600px;
-    float: left;
-    background-color: #2e2e2e;
-  }
-
-  .infinite-list {
-    padding: 0;
-    margin: 0;
-    color: white;
-    list-style-type: none;
-  }
-
-  .infinite-list-head {
-    height: 50px;
-    margin-top: 1px;
-    padding: 10px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: #2e2e2e;
-  }
-
-  .infinite-list-item {
-    cursor: pointer; /*鼠标放上变手*/
-    height: 50px;
-    margin-top: 1px;
-    padding: 10px;
-    display: flex;
-    justify-content: center; /*水平居中*/
-    align-items: center; /*垂直居中*/
-    background-color: #535353;
-  }
-
-  /* 右边内容 */
-  .chat-div {
-    width: 500px;
-    height: 600px;
-    float: left;
-    border: solid 1px #a3a3a3;
-  }
-
-  .chat-title {
-    height: 45px;
-    padding-left: 15px;
-    display: flex;
-    align-items: center;
-  }
-
-  .chat-title span {
-    font-size: 20px;
-  }
-
-  /* 右边中间消息展示 */
-  .news {
-    width: 500px;
-    height: 400px;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
-
-  /*隐藏中间的进度条*/
-  .news::-webkit-scrollbar {
-    display: none;
-  }
-
-  .expression {
-    width: 100%;
-    height: 30px;
-    padding-left: 15px;
-  }
-
-  .expression-emjio {
-    width: 35px;
-    height: 35px;
-    display: inline-block;
-  }
-
-  .expression i {
-    font-size: 20px;
-    color: #7d7d7d;
-    margin: 0 8px 0 0;
-  }
-
-  .send-message {
-
-  }
-
-  .send-textarea {
-    margin-left: 5px;
-    width: 98%;
-  }
-
-  .send-textarea >>> .el-textarea__inner {
-    border: 0;
-    resize: none;
-  }
-
-  .send-message span {
-    font-size: 13px;
-    margin: 8px 9px 1px 0;
-    float: right;
-    display: block;
-    color: #aaa9a9;
-  }
-
-  .send-but {
-    margin: 0;
-    padding: 0;
-    height: 25px;
-    width: 50px;
-  }
-
-  .chat-sender {
-    clear: both;
-    font-size: 80%;
-  }
-
-  /*聊天气泡效果*/
-  .chat-sender div:nth-of-type(1) {
-    float: left;
-  }
-
-  .chat-sender div:nth-of-type(2) {
-    margin: 0 50px 2px 50px;
-    padding: 0px;
-    color: #848484;
-    font-size: 70%;
-    text-align: left;
-  }
-
-  .chat-sender div:nth-of-type(3) {
-    background-color: #27aa95;
-    margin: 0px 150px 10px 55px;
-    padding: 10px 10px 10px 10px;
-    border-radius: 7px;
-    text-indent: -12px;
-  }
-
-  .chat-receiver {
-    clear: both;
-    font-size: 80%;
-  }
-
-  .chat-receiver div:nth-of-type(1) {
-    float: right;
-  }
+    // 选择表情
+    selectEmjio(value) {
+      let split = this.em[value - 1];
+      let s = this.content + '[' + split + ']';
+      this.content = s;
+    },
 
-  .chat-receiver div:nth-of-type(2) {
-    margin: 0px 50px 2px 50px;
-    padding: 0px;
-    color: #848484;
-    font-size: 70%;
-    text-align: right;
-  }
+    // 时间添加
+    timeAdd() {
+      let msg = {
+        sendUser: '',
+        acceptUser: '',
+        msg: '',
+        msgType: '10',
+        sendType: '',
+        isRead: '',
+        sendTime: new Date()
+      }
+      this.sendMessage.push(msg);
+    },
 
-  .chat-receiver div:nth-of-type(3) {
-    background-color: #b2e281;
-    margin: 0px 50px 10px 150px;
-    padding: 10px 10px 10px 10px;
-    border-radius: 7px;
-  }
+    // 时间判断
+    timeJudgment() {
+      let length = this.sendMessage.length;
+      if (length) {
 
-  .chat-receiver div:first-child img,
-  .chat-sender div:first-child img {
-    width: 40px;
-    height: 40px;
-    /*border-radius: 10%;*/
-  }
-
-  .chat-left_triangle {
-    height: 0px;
-    width: 0px;
-    border-width: 6px;
-    border-style: solid;
-    border-color: transparent #27aa95 transparent transparent;
-    position: relative;
-    left: -22px;
-    top: 3px;
-  }
+      }
 
-  .chat-right_triangle {
-    height: 0px;
-    width: 0px;
-    border-width: 6px;
-    border-style: solid;
-    border-color: transparent transparent transparent #b2e281;
-    position: relative;
-    right: -22px;
-    top: 3px;
-  }
+    },
 
-  .chat-notice {
-    clear: both;
-    font-size: 70%;
-    color: white;
-    text-align: center;
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
+    // 时间格式化
+    timeFormat(te) {
+      let timedate, s, mm, h, d, m, y, time;
+      if (te == '') {
+        return '';
+      } else if (te.length == 10) {
+        time = new Date(te * 1000);
+        y = time.getFullYear();
+        m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
+        d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
+        h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+        mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+        s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
+        timedate = y + '年' + m + '月' + d + '日 ' + h + ':' + mm + ':' + s;
+        return timedate;
+      } else {
+        time = new Date(te);
+        y = time.getFullYear();
+        m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
+        d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
+        h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+        mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+        s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
+        timedate = y + '年' + m + '月' + d + '日 ' + h + ':' + mm + ':' + s;
+        return timedate;
+      }
+    }
 
-  .chat-notice span {
-    background-color: #cecece;
-    line-height: 25px;
-    border-radius: 5px;
-    padding: 5px 10px;
   }
+}
+</script>
 
-  .emjio-img{
-    width: 30px;
-    height: 30px;
-    margin-bottom: -8px;
-  }
+<style scoped>
+.chat-section {
+  width: 81%;
+  height: 100%;
+  margin: 0 auto;
+}
+
+/* 左边的列表 */
+.leftDiv {
+  width: 20%;
+  height: 100.5%;
+  float: left;
+  background-color: #2e2e2e;
+}
+
+.infinite-list {
+  padding: 0;
+  margin: 0;
+  color: white;
+  list-style-type: none;
+}
+
+.infinite-list-head {
+  height: 50px;
+  margin-top: 1px;
+  padding: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #2e2e2e;
+}
+
+.infinite-list-item {
+  cursor: pointer; /*鼠标放上变手*/
+  height: 50px;
+  margin-top: 1px;
+  padding: 10px;
+  display: flex;
+  justify-content: center; /*水平居中*/
+  align-items: center; /*垂直居中*/
+  background-color: #535353;
+}
+
+/* 右边内容 */
+.chat-div {
+  width: 79.7%;
+  height: 100%;
+  float: left;
+  border: solid 1px #a3a3a3;
+}
+
+.chat-title {
+  height: 45px;
+  padding-left: 15px;
+  display: flex;
+  align-items: center;
+}
+
+.chat-title span {
+  font-size: 20px;
+}
+
+/* 右边中间消息展示 */
+.news {
+  width: 500px;
+  height: 63%;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+/*隐藏中间的进度条*/
+.news::-webkit-scrollbar {
+  display: none;
+}
+
+.expression {
+  width: 100%;
+  height: 30px;
+  padding-left: 15px;
+}
+
+.expression-emjio {
+  width: 35px;
+  height: 35px;
+  display: inline-block;
+}
+
+.expression i {
+  font-size: 20px;
+  color: #7d7d7d;
+  margin: 0 8px 0 0;
+}
+
+.send-message {
+
+}
+
+.send-textarea {
+  margin-left: 5px;
+  width: 98%;
+}
+
+.send-textarea >>> .el-textarea__inner {
+  border: 0;
+  resize: none;
+}
+
+.send-message span {
+  font-size: 13px;
+  margin: 8px 9px 1px 0;
+  float: right;
+  display: block;
+  color: #aaa9a9;
+}
+
+.send-but {
+  margin: 0;
+  padding: 0;
+  height: 25px;
+  width: 50px;
+}
+
+.chat-sender {
+  clear: both;
+  font-size: 80%;
+}
+
+/*聊天气泡效果*/
+.chat-sender div:nth-of-type(1) {
+  float: left;
+}
+
+.chat-sender div:nth-of-type(2) {
+  margin: 0 50px 2px 50px;
+  padding: 0px;
+  color: #848484;
+  font-size: 70%;
+  text-align: left;
+}
+
+.chat-sender div:nth-of-type(3) {
+  background-color: #27aa95;
+  margin: 0px 150px 10px 55px;
+  padding: 10px 10px 10px 10px;
+  border-radius: 7px;
+  text-indent: -12px;
+}
+
+.chat-receiver {
+  clear: both;
+  font-size: 80%;
+}
+
+.chat-receiver div:nth-of-type(1) {
+  float: right;
+}
+
+.chat-receiver div:nth-of-type(2) {
+  margin: 0px 50px 2px 50px;
+  padding: 0px;
+  color: #848484;
+  font-size: 70%;
+  text-align: right;
+}
+
+.chat-receiver div:nth-of-type(3) {
+  background-color: #b2e281;
+  margin: 0px 50px 10px 150px;
+  padding: 10px 10px 10px 10px;
+  border-radius: 7px;
+}
+
+.chat-receiver div:first-child img,
+.chat-sender div:first-child img {
+  width: 40px;
+  height: 40px;
+  /*border-radius: 10%;*/
+}
+
+.chat-left_triangle {
+  height: 0px;
+  width: 0px;
+  border-width: 6px;
+  border-style: solid;
+  border-color: transparent #27aa95 transparent transparent;
+  position: relative;
+  left: -22px;
+  top: 3px;
+}
+
+.chat-right_triangle {
+  height: 0px;
+  width: 0px;
+  border-width: 6px;
+  border-style: solid;
+  border-color: transparent transparent transparent #b2e281;
+  position: relative;
+  right: -22px;
+  top: 3px;
+}
+
+.chat-notice {
+  clear: both;
+  font-size: 70%;
+  color: white;
+  text-align: center;
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+
+.chat-notice span {
+  background-color: #cecece;
+  line-height: 25px;
+  border-radius: 5px;
+  padding: 5px 10px;
+}
+
+.emjio-img {
+  width: 30px;
+  height: 30px;
+  margin-bottom: -8px;
+}
 
 </style>
diff --git a/src/views/system/stuClass/index.vue b/src/views/system/stuClass/index.vue
index 8327902d11213bfab44017ed9aaebab93ac4da7e..8b82a241239323727808fa66fb1cc619c024d19b 100644
--- a/src/views/system/stuClass/index.vue
+++ b/src/views/system/stuClass/index.vue
@@ -2,15 +2,17 @@
   <div>
     <section>
       <el-row class="title-add">
-        <el-col :span="17">
-          <el-button type="primary" icon="el-icon-plus" @click="addStu">新增</el-button>
+        <el-col :span="15">
+          <el-button type="primary" icon="el-icon-plus" @click="addStu">新增班级</el-button>
         </el-col>
         <!--搜索条件-->
         <el-col :span="4">
           <el-input v-model="stuName" placeholder="请输入名称" clearable></el-input>
         </el-col>
         <el-col :span="3">
-          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" style="margin-left: 15px" @click="getList">查询</el-button>
+        </el-col>
+        <el-col :span="2">
           <el-button type="success" icon="el-icon-circle-close" @click="cleanUp">清除</el-button>
         </el-col>
       </el-row>
@@ -112,198 +114,198 @@
 </template>
 
 <script>
-  export default {
-    name: "stuClass",
-    data() {
-      return {
-        departmentData: [],                 // 系数据
-        collegeData: [],                    // 学院数据
-        sign: '',                           // pid选择的标志
-        total: 1,                           // 总数
-        page: 1,                            // 当前页
-        limit: 10,                          // 分页大小
-        stuName: '',
-        tableData: [],
-        userData: [],                       // 管理者
+export default {
+  name: "stuClass",
+  data() {
+    return {
+      departmentData: [],                 // 系数据
+      collegeData: [],                    // 学院数据
+      sign: '',                           // pid选择的标志
+      total: 1,                           // 总数
+      page: 1,                            // 当前页
+      limit: 10,                          // 分页大小
+      stuName: '',
+      tableData: [],
+      userData: [],                       // 管理者
 
-        // 新增
-        title: '',
-        closeOnClickModal: false,
-        addAndEditDialogFormVisible: false,
-        isEditable: true,                   // 标志是否是编辑
-        showAddAndEditForm: false,
-        showForm: false,
-        formLabelWidth: '150px',
-        addAndEditFormData: {
-          id: '',
-          name: '',
-          pid: '',
-          sign: '',
-          grade: '',
-          userId: ''
+      // 新增
+      title: '',
+      closeOnClickModal: false,
+      addAndEditDialogFormVisible: false,
+      isEditable: true,                   // 标志是否是编辑
+      showAddAndEditForm: false,
+      showForm: false,
+      formLabelWidth: '150px',
+      addAndEditFormData: {
+        id: '',
+        name: '',
+        pid: '',
+        sign: '',
+        grade: '',
+        userId: ''
+      },
+      addAndEditRules: {
+        name: {
+          required: true, message: '名称不能为空', trigger: 'blur'
         },
-        addAndEditRules: {
-          name: {
-            required: true, message: '名称不能为空', trigger: 'blur'
-          },
-          sign: {
-            required: true, message: '类型不能为空', trigger: 'blur'
-          },
-          userId: {
-            required: true, message: '管理者不能为空', trigger: 'blur'
-          },
+        sign: {
+          required: true, message: '类型不能为空', trigger: 'blur'
+        },
+        userId: {
+          required: true, message: '管理者不能为空', trigger: 'blur'
         },
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      // 新增
-      addStu() {
-        this.queryCollege();
-        this.wholeUser();
-        this.title = "新增";
-        this.isEditable = false;
-        this.showAddAndEditForm = true;
-        this.addAndEditDialogFormVisible = true;
-        this.sign = '';
       },
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 新增
+    addStu() {
+      this.queryCollege();
+      this.wholeUser();
+      this.title = "新增";
+      this.isEditable = false;
+      this.showAddAndEditForm = true;
+      this.addAndEditDialogFormVisible = true;
+      this.sign = '';
+    },
 
-      // 查询
-      getList() {
-        this.api.getApi("/stu/class/get?page=" + this.page + "&limit=" + this.limit + "&name=" + this.stuName).then(res => {
-          this.tableData = res.data.list;
-          this.total = res.data.total;
-          this.page = res.data.pageNum;
-          this.limit = res.data.pageSize;
-        })
-      },
+    // 查询
+    getList() {
+      this.api.getApi("/stu/class/get?page=" + this.page + "&limit=" + this.limit + "&name=" + this.stuName).then(res => {
+        this.tableData = res.data.list;
+        this.total = res.data.total;
+        this.page = res.data.pageNum;
+        this.limit = res.data.pageSize;
+      })
+    },
 
-      // 查询系和学院
-      async queryCollege() {
-        this.departmentData = [];
-        this.collegeData = [];
-        await this.api.getApi("/stu/class/non/class").then(res => {
-          this.collegeData = res.data.college;
-          this.departmentData = res.data.department;
-        })
-      },
+    // 查询系和学院
+    async queryCollege() {
+      this.departmentData = [];
+      this.collegeData = [];
+      await this.api.getApi("/stu/class/non/class").then(res => {
+        this.collegeData = res.data.college;
+        this.departmentData = res.data.department;
+      })
+    },
 
-      // 筛选
-      filterTag(value, row) {
-        return row.sign === value;
-      },
+    // 筛选
+    filterTag(value, row) {
+      return row.sign === value;
+    },
 
-      // 清除
-      cleanUp() {
-        this.stuName = '';
-        this.getList();
-      },
+    // 清除
+    cleanUp() {
+      this.stuName = '';
+      this.getList();
+    },
 
-      // 编辑
-      editData(index, row) {
-        this.queryCollege();
-        this.wholeUser();
-        this.title = "编辑";
-        this.isEditable = true;
-        this.$set(this.addAndEditFormData, 'id', row.id);
-        this.$set(this.addAndEditFormData, 'name', row.name);
-        this.$set(this.addAndEditFormData, 'pid', row.pid);
-        this.$set(this.addAndEditFormData, 'sign', row.sign + '');
-        this.$set(this.addAndEditFormData, 'grade', row.grade);
-        this.$set(this.addAndEditFormData, 'userId', row.userId);
-        this.showAddAndEditForm = true;
-        this.addAndEditDialogFormVisible = true;
-        // 系和学院显示
-        this.sign = row.sign + '';
-      },
+    // 编辑
+    editData(index, row) {
+      this.queryCollege();
+      this.wholeUser();
+      this.title = "编辑";
+      this.isEditable = true;
+      this.$set(this.addAndEditFormData, 'id', row.id);
+      this.$set(this.addAndEditFormData, 'name', row.name);
+      this.$set(this.addAndEditFormData, 'pid', row.pid);
+      this.$set(this.addAndEditFormData, 'sign', row.sign + '');
+      this.$set(this.addAndEditFormData, 'grade', row.grade);
+      this.$set(this.addAndEditFormData, 'userId', row.userId);
+      this.showAddAndEditForm = true;
+      this.addAndEditDialogFormVisible = true;
+      // 系和学院显示
+      this.sign = row.sign + '';
+    },
 
-      // 删除
-      deleteData(id) {
-        this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.api.deleteApi("/stu/class/delete?id=" + id).then(res => {
-            if (res.data.code === 200) {
-              this.getList();
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
+    // 删除
+    deleteData(id) {
+      this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.api.deleteApi("/stu/class/delete?id=" + id).then(res => {
+          if (res.data.code === 200) {
+            this.getList();
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
         });
-      },
+      });
+    },
 
-      // 关闭模态框
-      handleDialogClose() {
-        this.showAddAndEditForm = false;
-        this.addAndEditFormData = {};
-        this.addAndEditDialogFormVisible = false;
-      },
+    // 关闭模态框
+    handleDialogClose() {
+      this.showAddAndEditForm = false;
+      this.addAndEditFormData = {};
+      this.addAndEditDialogFormVisible = false;
+    },
 
-      // 保存/修改
-      handleConfirmEvent(formName) {
-        this.$refs[formName].validate(async valid => {
-          if (valid) {
-            let formData = this.addAndEditFormData;
-            if (this.isEditable) {
-              this.api.putApi("/stu/class/update", formData).then(res => {
-                if (res.data.code === 200) {
-                  this.getList();
-                  this.handleDialogClose();
-                }
-              })
-            } else {
-              this.api.postApi("/stu/class/add", formData).then(res => {
-                if (res.data.code === 200) {
-                  this.getList();
-                  this.handleDialogClose();
-                }
-              })
-            }
+    // 保存/修改
+    handleConfirmEvent(formName) {
+      this.$refs[formName].validate(async valid => {
+        if (valid) {
+          let formData = this.addAndEditFormData;
+          if (this.isEditable) {
+            this.api.putApi("/stu/class/update", formData).then(res => {
+              if (res.data.code === 200) {
+                this.getList();
+                this.handleDialogClose();
+              }
+            })
+          } else {
+            this.api.postApi("/stu/class/add", formData).then(res => {
+              if (res.data.code === 200) {
+                this.getList();
+                this.handleDialogClose();
+              }
+            })
           }
-        })
-      },
+        }
+      })
+    },
 
-      // 分页大小
-      handleSizeChange(val) {
-        this.limit = val;
-        this.getList();
-      },
+    // 分页大小
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getList();
+    },
 
-      // 第几页
-      handleCurrentChange(val) {
-        this.page = val;
-        this.getList();
-      },
+    // 第几页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getList();
+    },
 
-      // 加载全部用户
-      async wholeUser() {
-        this.userData = [];
-        await this.api.getApi("/manager/stu/whole/user").then(res => {
-          this.userData = res.data
-        })
-      },
+    // 加载全部用户
+    async wholeUser() {
+      this.userData = [];
+      await this.api.getApi("/manager/stu/whole/user").then(res => {
+        this.userData = res.data
+      })
+    },
 
-      // 监听类型的变化
-      monitorSign(value) {
-        this.sign = value;
-      },
-    }
+    // 监听类型的变化
+    monitorSign(value) {
+      this.sign = value;
+    },
   }
+}
 </script>
 
 <style scoped>
-  .title-add {
-    margin: 10px 10px 10px 0;
-  }
+.title-add {
+  margin: 10px 10px 10px 0;
+}
 
-  .bottom-page {
-    margin-top: 25px;
-  }
+.bottom-page {
+  margin-top: 25px;
+}
 </style>
diff --git a/src/views/system/stuMenu/index.vue b/src/views/system/stuMenu/index.vue
index 0e2cbe070eae624f6ba454c1c5ef7141c5bb21bc..a9ccb440dc0812604d31b1c4dba3089738a7e3b7 100644
--- a/src/views/system/stuMenu/index.vue
+++ b/src/views/system/stuMenu/index.vue
@@ -2,15 +2,17 @@
   <div>
     <section>
       <el-row class="title-add">
-        <el-col :span="17">
+        <el-col :span="16">
           <el-button type="primary" icon="el-icon-plus" @click="addMenu">新增菜单</el-button>
         </el-col>
         <!--搜索条件-->
         <el-col :span="4">
           <el-input v-model="menuName" placeholder="请输入菜单名称" clearable></el-input>
         </el-col>
-        <el-col :span="3">
-          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+        <el-col :span="2">
+          <el-button type="primary" icon="el-icon-search" style="margin-left: 15px" @click="getList">查询</el-button>
+        </el-col>
+        <el-col :span="2">
           <el-button type="success" icon="el-icon-circle-close" @click="cleanUp">清除</el-button>
         </el-col>
       </el-row>
@@ -62,18 +64,22 @@
     </section>
 
     <!--新增/编辑模态框-->
-    <el-dialog :title="title" :closeOnClickModal="closeOnClickModal" :visible.sync="addAndEditDialogFormVisible" :before-close="handleDialogClose">
-      <el-form v-if="showAddAndEditForm" ref="addAndEditElForm" :model="addAndEditFormData" :rules="addAndEditRules" class="form">
+    <el-dialog :title="title" :closeOnClickModal="closeOnClickModal" :visible.sync="addAndEditDialogFormVisible"
+               :before-close="handleDialogClose">
+      <el-form v-if="showAddAndEditForm" ref="addAndEditElForm" :model="addAndEditFormData" :rules="addAndEditRules"
+               class="form">
         <el-row>
           <el-col :span="10">
             <el-form-item prop="name" label="菜单名称：" :label-width="formLabelWidth">
-              <el-input v-model="addAndEditFormData.name" placeholder="请输入菜单名称" style="width:100%" type="text" autosize></el-input>
+              <el-input v-model="addAndEditFormData.name" placeholder="请输入菜单名称" style="width:100%" type="text"
+                        autosize></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item prop="pid" label="父级：" :label-width="formLabelWidth">
               <el-select v-model="addAndEditFormData.pid" placeholder="请选择父级菜单" style="width:100%" clearable>
-                <el-option :value="pidTemp.id" :label="pidTemp.name" style="height:150px;overflow: auto;background-color:#fff">
+                <el-option :value="pidTemp.id" :label="pidTemp.name"
+                           style="height:150px;overflow: auto;background-color:#fff">
                   <el-tree :data="pidData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
                 </el-option>
               </el-select>
@@ -81,10 +87,12 @@
           </el-col>
         </el-row>
         <el-form-item prop="code" label="权限code：" :label-width="formLabelWidth">
-          <el-input v-model="addAndEditFormData.code" placeholder="请输入权限code" style="width:90%" type="text" autosize></el-input>
+          <el-input v-model="addAndEditFormData.code" placeholder="请输入权限code" style="width:90%" type="text"
+                    autosize></el-input>
         </el-form-item>
         <el-form-item prop="url" label="页面url：" :label-width="formLabelWidth">
-          <el-input v-model="addAndEditFormData.url" placeholder="请输入页面url" style="width:90%" type="text" autosize></el-input>
+          <el-input v-model="addAndEditFormData.url" placeholder="请输入页面url" style="width:90%" type="text"
+                    autosize></el-input>
         </el-form-item>
         <el-row>
           <el-col :span="10">
@@ -98,7 +106,8 @@
           </el-col>
           <el-col :span="10">
             <el-form-item prop="isVisible" label="是否启用：" :label-width="formLabelWidth">
-              <el-switch v-model="addAndEditFormData.isVisible" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+              <el-switch v-model="addAndEditFormData.isVisible" active-color="#13ce66"
+                         inactive-color="#ff4949"></el-switch>
             </el-form-item>
           </el-col>
         </el-row>
@@ -180,14 +189,14 @@ export default {
         id: '11',
         name: '1'
       },
-      iconData:["el-icon-delete-solid","el-icon-delete","el-icon-s-tools","el-icon-setting","el-icon-user-solid","el-icon-user","el-icon-phone","el-icon-phone-outline","el-icon-star-on",
-        "el-icon-star-off","el-icon-s-goods","el-icon-goods","el-icon-warning","el-icon-warning-outline","el-icon-question","el-icon-info","el-icon-remove","el-icon-circle-plus","el-icon-success",
-        "el-icon-error","el-icon-zoom-in","el-icon-zoom-out","el-icon-remove-outline","el-icon-circle-plus-outline","el-icon-circle-check","el-icon-circle-close","el-icon-s-help",
-        "el-icon-help","el-icon-picture","el-icon-picture-outline","el-icon-picture-outline-round","el-icon-upload","el-icon-camera-solid","el-icon-camera","el-icon-video-camera-solid","el-icon-video-camera",
-        "el-icon-message-solid","el-icon-bell","el-icon-s-cooperation","el-icon-s-order","el-icon-s-platform","el-icon-s-fold","el-icon-s-unfold","el-icon-s-operation","el-icon-s-promotion",
-        "el-icon-s-home","el-icon-s-release","el-icon-s-ticket","el-icon-s-management","el-icon-s-open","el-icon-s-shop","el-icon-s-marketing","el-icon-s-flag","el-icon-s-comment",
-        "el-icon-s-finance","el-icon-s-claim","el-icon-s-custom","el-icon-s-opportunity","el-icon-s-data","el-icon-s-check","el-icon-s-grid","el-icon-menu","el-icon-folder","el-icon-folder-opened",
-        "el-icon-folder-add","el-icon-folder-remove","el-icon-folder-delete","el-icon-folder-checked","el-icon-monitor","el-icon-coin"
+      iconData: ["el-icon-delete-solid", "el-icon-delete", "el-icon-s-tools", "el-icon-setting", "el-icon-user-solid", "el-icon-user", "el-icon-phone", "el-icon-phone-outline", "el-icon-star-on",
+        "el-icon-star-off", "el-icon-s-goods", "el-icon-goods", "el-icon-warning", "el-icon-warning-outline", "el-icon-question", "el-icon-info", "el-icon-remove", "el-icon-circle-plus", "el-icon-success",
+        "el-icon-error", "el-icon-zoom-in", "el-icon-zoom-out", "el-icon-remove-outline", "el-icon-circle-plus-outline", "el-icon-circle-check", "el-icon-circle-close", "el-icon-s-help",
+        "el-icon-help", "el-icon-picture", "el-icon-picture-outline", "el-icon-picture-outline-round", "el-icon-upload", "el-icon-camera-solid", "el-icon-camera", "el-icon-video-camera-solid", "el-icon-video-camera",
+        "el-icon-message-solid", "el-icon-bell", "el-icon-s-cooperation", "el-icon-s-order", "el-icon-s-platform", "el-icon-s-fold", "el-icon-s-unfold", "el-icon-s-operation", "el-icon-s-promotion",
+        "el-icon-s-home", "el-icon-s-release", "el-icon-s-ticket", "el-icon-s-management", "el-icon-s-open", "el-icon-s-shop", "el-icon-s-marketing", "el-icon-s-flag", "el-icon-s-comment",
+        "el-icon-s-finance", "el-icon-s-claim", "el-icon-s-custom", "el-icon-s-opportunity", "el-icon-s-data", "el-icon-s-check", "el-icon-s-grid", "el-icon-menu", "el-icon-folder", "el-icon-folder-opened",
+        "el-icon-folder-add", "el-icon-folder-remove", "el-icon-folder-delete", "el-icon-folder-checked", "el-icon-monitor", "el-icon-coin"
       ]
     }
   },
@@ -197,7 +206,7 @@ export default {
   methods: {
     getList() {
       // 加载表格数据
-      this.api.getApi("/menu/get?page="+this.page+"&limit="+this.limit+"&name=" + this.menuName).then(res => {
+      this.api.getApi("/menu/get?page=" + this.page + "&limit=" + this.limit + "&name=" + this.menuName).then(res => {
         this.tableData = res.data.list;
         this.total = res.data.total;
         this.page = res.data.pageNum;
@@ -218,7 +227,7 @@ export default {
     },
 
     // 清除
-    cleanUp(){
+    cleanUp() {
       this.menuName = '';
       this.getList();
     },
@@ -229,7 +238,7 @@ export default {
     },
 
     // 选择icon图标
-    getIcon(value){
+    getIcon(value) {
       this.addAndEditFormData.iconImg = value;
     },
 
@@ -245,32 +254,32 @@ export default {
       await this.api.getApi("/menu/get/treeMenu").then(res => {
         this.pidData = res.data;
         // pid不为空时候去给pidTemp设置相应数值
-        if (pid !== ''){
-          for (let i = 0;i<res.data.length;i++) {
-              let temp = res.data[i];
-              if (temp.id === pid){
-                this.pidTemp.id = temp.id;
-                this.pidTemp.name = temp.name;
-                return;
-              }
-              if (temp.child !== undefined) {
-                this.findPid(temp.child, pid);
-              }
+        if (pid !== '') {
+          for (let i = 0; i < res.data.length; i++) {
+            let temp = res.data[i];
+            if (temp.id === pid) {
+              this.pidTemp.id = temp.id;
+              this.pidTemp.name = temp.name;
+              return;
+            }
+            if (temp.child !== undefined) {
+              this.findPid(temp.child, pid);
+            }
           }
         }
       })
     },
 
     // 查找
-    findPid(data,pid){
-      for (let i = 0;i<data.length;i++){
+    findPid(data, pid) {
+      for (let i = 0; i < data.length; i++) {
         let temp = data[i];
-        if (temp.id === pid){
+        if (temp.id === pid) {
           this.pidTemp.id = temp.id;
           this.pidTemp.name = temp.name;
           return;
         }
-        if (temp.child !== undefined){
+        if (temp.child !== undefined) {
           this.findPid(temp.child, pid);
         }
       }
@@ -327,7 +336,7 @@ export default {
         if (valid) {
           let formData = this.addAndEditFormData;
           if (this.isEditable) {
-            if (formData.id === formData.pid){
+            if (formData.id === formData.pid) {
               this.$message.error('出现错误，父级不可以是自己');
               return;
             }
@@ -368,7 +377,7 @@ export default {
   margin: 10px 10px 10px 0;
 }
 
-.bottom-page{
+.bottom-page {
   margin-top: 25px;
 }
 
@@ -376,7 +385,7 @@ export default {
   padding: 12px 7px;
 }
 
-.icon-img{
+.icon-img {
   position: absolute;
   right: 190px;
   bottom: 20px;