From 355ab62c195f4ef1521618cc0a4a134abca2b13b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 2 Jun 2023 20:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                         |   5 +
 src/layouts/header/index.vue             | 325 +++++++++++++----------
 src/pages/activity/list/index.vue        |  41 +--
 src/pages/activity/manage/list/index.vue |  12 +-
 src/pages/station/preview/index.vue      | 245 ++++++++++++-----
 src/setting.js                           |   4 +-
 src/styles/page/station.scss             |   6 +-
 7 files changed, 408 insertions(+), 230 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 746d588..db7f6e2 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -33,6 +33,7 @@ export default {
     findLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/findById',
     saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save',
     updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update',
+    maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList',
 
     // 课程笔记
     addNote: `nakadai/curriculumNotes/addNote`,
@@ -46,6 +47,8 @@ export default {
     deleteAComment: `nakadai/comment/deleteAComment`,
     commentAndLike: `nakadai/commentLike/commentAndLike`,
     unlike: `nakadai/commentLike/unlike`,
+    messageNotificationList: `nakadai/notify/messageNotificationList`,
+    noticeRead: `nakadai/notify/noticeRead`,
 
     // 能力测评
     canExperiment: `occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验
@@ -166,6 +169,8 @@ export default {
     findActivityAnnouncement: `occupationlab/occupationlab/activity/announcement/queryAnnouncementDetails`,
     delActivityAnnouncementAnnex: `occupationlab/occupationlab/activity/announcement/annex/delete`,
     saveActivityAnnouncementAnnex: `occupationlab/occupationlab/activity/announcement/annex/save`,
+    collectionActivity: `occupationlab/occupationlab/activity/collectionActivity`,
+    concernedActivity: `occupationlab/occupationlab/activity/concernedActivity`,
 
     // 阿里云文件/视频管理
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index d9614b7..8dd4c46 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,41 +1,69 @@
 <template>
-    <div class="header">
-        <a class="logo" @click="toIndex">
-          <template v-if="isIndex">
-            <img v-if="!isZxy" src="@/assets/img/logo.png" alt="">
-            <img v-else src="@/assets/img/zxy/logo.png" alt="">
-          </template>
-          <template v-else>
-              <img :src="logoUrl" height="50" />
-              <span class="title">{{title}}</span>
-          </template>
-        </a>
-        <div class="inner">
-            <navbar class="nav-wrap" ref="nav"></navbar>
-            <div class="right">
-              <template v-if="token || serverToken">
-                <div class="user-wrap">
-                  <el-dropdown size="medium" @command="menuChange">
-                    <div class="user">
-                      <el-avatar :size="35" :src="avatar"></el-avatar>
-                      <span class="username">{{ customerName || cName || userName }}</span>
-                    </div>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-if="isIndex" command="index">前往{{ serverToken ? '教学' : '学习' }}</el-dropdown-item>
-                      <el-dropdown-item v-if="!customerName && !serverToken" command="info">个人中心</el-dropdown-item>
-                      <el-dropdown-item command="logout">退出登录</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </div>
-              </template>
-              <div v-else class="login" @click="toNew('/login')">
-                  <img src="@/assets/img/user.png" alt="">
-                  <span>登录</span>
+  <div class="header">
+    <a class="logo"
+       @click="toIndex">
+      <template v-if="isIndex">
+        <img v-if="!isZxy"
+             src="@/assets/img/logo.png"
+             alt="">
+        <img v-else
+             src="@/assets/img/zxy/logo.png"
+             alt="">
+      </template>
+      <template v-else>
+        <img :src="logoUrl"
+             height="50" />
+        <span class="title">{{title}}</span>
+      </template>
+    </a>
+    <div class="inner">
+      <navbar class="nav-wrap"
+              ref="nav"></navbar>
+
+      <div class="right">
+        <template v-if="token || serverToken">
+          <el-popover placement="top"
+                      :disabled="!notices.length">
+            <p v-for="(item, i) in notices"
+               :key="i"
+               class="p-v-5 cursor-pointer"
+               @click="toComment(item)">{{ item.commentUsername }} 回复了你的评论</p>
+            <el-badge class="msg"
+                      :is-dot="notices.length"
+                      slot="reference">消息</el-badge>
+          </el-popover>
+          <div class="user-wrap">
+            <el-dropdown size="medium"
+                         @command="menuChange">
+              <div class="user">
+                <el-avatar :size="35"
+                           :src="avatar"></el-avatar>
+                <span class="username">{{ customerName || cName || userName }}</span>
               </div>
-              <el-button v-if="isZxy && isIndex" class="trial" type="primary" @click="toTrial">免费试用</el-button>
-            </div>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-if="isIndex"
+                                  command="index">前往{{ serverToken ? '教学' : '学习' }}</el-dropdown-item>
+                <el-dropdown-item v-if="!customerName && !serverToken"
+                                  command="info">个人中心</el-dropdown-item>
+                <el-dropdown-item command="logout">退出登录</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        </template>
+        <div v-else
+             class="login"
+             @click="toNew('/login')">
+          <img src="@/assets/img/user.png"
+               alt="">
+          <span>登录</span>
         </div>
+        <el-button v-if="isZxy && isIndex"
+                   class="trial"
+                   type="primary"
+                   @click="toTrial">免费试用</el-button>
+      </div>
     </div>
+  </div>
 </template>
 <script>
 import { mapState, mapMutations, mapActions } from "vuex";
@@ -44,101 +72,124 @@ import util from "@/libs/util";
 import navbar from "../navbar";
 import axios from 'axios'
 export default {
-    data() {
-        return {
-          token: util.local.get(Setting.tokenKey), // 学生端token
-          serverToken: util.local.get('oc_server_token'), // 教师端token
-          cName: util.cookies.get('customerName'),
-          isIndex: Setting.whiteList.find(e => e === this.$route.path), // 是否是在白名单页面
-          isZxy: Setting.isZxy
-        };
+  data () {
+    return {
+      token: util.local.get(Setting.tokenKey), // 学生端token
+      serverToken: util.local.get('oc_server_token'), // 教师端token
+      cName: util.cookies.get('customerName'),
+      isIndex: Setting.whiteList.find(e => e === this.$route.path), // 是否是在白名单页面
+      isZxy: Setting.isZxy,
+      notices: [],
+      noticeTimer: null
+    };
+  },
+  components: {
+    navbar
+  },
+  computed: {
+    ...mapState("user", [
+      "title", "logoUrl", "avatar", "userName", 'customerName'
+    ])
+  },
+  mounted () {
+    if (this.token) {
+      this.getSystemDetail();
+      this.getUserInfo();
+      this.getNotice()
+    }
+
+    this.$once('hook:beforeDestroy', function () {
+      clearInterval(this.noticeTimer)
+    })
+  },
+  methods: {
+    ...mapMutations("user", [
+      'SET_CUSTOMERNAME', 'setUserId'
+    ]),
+    ...mapActions("user", [
+      "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
+    ]),
+    // 获取logo和平台名
+    getSystemDetail () {
+      this.$get(this.api.logoDetail).then(({ data }) => {
+        if (data) {
+          this.setTitle(data.title);
+          this.setLogoUrl(data.logoUrl);
+        }
+      }).catch(res => { });
+    },
+    // 获取消息
+    getNotice () {
+      if (!Setting.isDev) {
+        this.noticeTimer = setInterval(() => {
+          this.$get(this.api.messageNotificationList, {
+            type: 2
+          }).then(res => {
+            this.notices = res.notificationList
+          }).catch(res => { });
+        }, 1000)
+      }
     },
-    components: {
-        navbar
+    // 前往评论列表
+    toComment (item) {
+      this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`)
     },
-    computed: {
-        ...mapState("user", [
-            "title", "logoUrl", "avatar", "userName", 'customerName'
-        ])
+    // 获取用户信息
+    getUserInfo () {
+      this.$get(this.api.queryUserInfoDetails).then(res => {
+        const { userAvatars, userName, userId } = res.result.hrUserInfo || {}
+        userAvatars && this.setAvatar(userAvatars);
+        this.setUserId(userId)
+        this.setUserName(userName);
+        if (!userName && !this.customerName) {
+          this.$get(this.api.isClient).then(res => {
+            res.customerName && this.SET_CUSTOMERNAME(res.customerName)
+          }).catch(res => { })
+        }
+      }).catch(err => { })
     },
-    mounted() {
-      if (this.token) {
-        this.getSystemDetail();
-        this.getUserInfo();
+    // 用户名下拉回调
+    menuChange (e) {
+      if (e === 'index') {
+        this.toNew('/station')
+      } else if (e === 'info') {
+        window.open(this.$router.resolve('/setting/person').href)
+      } else if (e === 'logout') {
+        this.logout()
       }
     },
-    methods: {
-        ...mapMutations("user", [
-            'SET_CUSTOMERNAME', 'setUserId'
-        ]),
-        ...mapActions("user", [
-            "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
-        ]),
-        // 获取logo和平台名
-        getSystemDetail () {
-            this.$get(this.api.logoDetail).then(({ data }) => {
-                if (data) {
-                    this.setTitle(data.title);
-                    this.setLogoUrl(data.logoUrl);
-                }
-            }).catch(res => {});
-        },
-        // 获取用户信息
-        getUserInfo() {
-            this.$get(this.api.queryUserInfoDetails).then(res => {
-                const {userAvatars, userName, userId} = res.result.hrUserInfo || {}
-                userAvatars && this.setAvatar(userAvatars);
-                this.setUserId(userId)
-                this.setUserName(userName);
-                if (!userName && !this.customerName) {
-                    this.$get(this.api.isClient).then(res => {
-                        res.customerName && this.SET_CUSTOMERNAME(res.customerName)
-                    }).catch(res => {})
-                }
-            }).catch(err => {})
-        },
-        // 用户名下拉回调
-        menuChange(e) {
-          if (e === 'index') {
-            this.toNew('/station')
-          } else if (e === 'info') {
-            window.open(this.$router.resolve('/setting/person').href)
-          } else if (e === 'logout') {
-            this.logout()
-          }
-        },
-        // 前往首页
-        toIndex() {
-            this.$refs.nav.jump({
-                index: this.isIndex ? '/index/list' : '/station/list'
-            })
-        },
-        // 打开新tab
-        toNew(path) {
-          // 如果缓存里有教师端的标识，则前往教师端，否则，打开学生端
-          if (util.cookies.get('serverLogin') === 'true' && util.local.get('oc_server_token')) {
-            const defaultPath = '/station/list' // 默认路径
-            // 查询教师端的权限
-            axios.get(`${this.api.getUserRolesPermissionMenu}?platformId=1`, {
-              headers: {
-                token: this.serverToken
-              }
-            }).then(({ data }) => {
-              const list = data.permissionMenu[0].children
-              const route = list.find(e => e.path === defaultPath) ? defaultPath : list[0].path // 如果有默认路由的权限，则跳转到默认路由，否则跳转到第一个
-              window.open(process.env.NODE_ENV === 'development' ?
-                `http://192.168.31.125:8081/#${route}` :
-                `${location.origin}/admin/#${route}`)
-            }).catch(err => {})
-          } else {
-            window.open(this.$router.resolve(path).href)
+    // 前往首页
+    toIndex () {
+      this.$refs.nav.jump({
+        index: this.isIndex ? '/index/list' : '/station/list'
+      })
+    },
+    // 打开新tab
+    toNew (path) {
+      // 如果缓存里有教师端的标识，则前往教师端，否则，打开学生端
+      if (util.cookies.get('serverLogin') === 'true' && util.local.get('oc_server_token')) {
+        const defaultPath = '/station/list' // 默认路径
+        // 查询教师端的权限
+        axios.get(`${this.api.getUserRolesPermissionMenu}?platformId=1`, {
+          headers: {
+            token: this.serverToken
           }
-        },
-        // 免费试用
-        toTrial() {
-          window.open('https://www.wjx.top/vm/wFCPCFp.aspx')
-        },
-    }
+        }).then(({ data }) => {
+          const list = data.permissionMenu[0].children
+          const route = list.find(e => e.path === defaultPath) ? defaultPath : list[0].path // 如果有默认路由的权限，则跳转到默认路由，否则跳转到第一个
+          window.open(process.env.NODE_ENV === 'development' ?
+            `http://192.168.31.125:8081/#${route}` :
+            `${location.origin}/admin/#${route}`)
+        }).catch(err => { })
+      } else {
+        window.open(this.$router.resolve(path).href)
+      }
+    },
+    // 免费试用
+    toTrial () {
+      window.open('https://www.wjx.top/vm/wFCPCFp.aspx')
+    },
+  }
 };
 </script>
 <style scoped lang="scss">
@@ -153,7 +204,7 @@ $height: 64px;
     height: $height;
     background-color: #fff;
     box-shadow: 0px 0px 6px 0px rgba(178, 178, 178, 0.32);
-    .inner{
+    .inner {
         display: flex;
         justify-content: space-between;
         align-items: center;
@@ -161,14 +212,14 @@ $height: 64px;
         padding: 0 80px 0 10px;
         margin: 0 auto;
     }
-    .logo{
+    .logo {
         position: absolute;
         top: 0;
         left: 40px;
         display: flex;
         align-items: center;
         font-size: 28px;
-        color: #568DF2;
+        color: #568df2;
         height: $height;
         cursor: pointer;
         img {
@@ -183,8 +234,12 @@ $height: 64px;
         height: 64px;
     }
     .right {
-      display: inline-flex;
-      align-items: center;
+        display: inline-flex;
+        align-items: center;
+    }
+    .msg {
+        margin-right: 30px;
+        cursor: pointer;
     }
     .user-wrap {
         display: inline-flex;
@@ -199,7 +254,7 @@ $height: 64px;
         width: 2px;
         height: 15px;
         margin-left: 15px;
-        background-color: #D8D8D8;
+        background-color: #d8d8d8;
     }
     .username {
         margin-left: 10px;
@@ -211,22 +266,22 @@ $height: 64px;
         color: #666;
         cursor: pointer;
     }
-    .login{
+    .login {
         display: inline-flex;
         align-items: center;
         cursor: pointer;
-        &:hover{
-            opacity: .9;
+        &:hover {
+            opacity: 0.9;
         }
-        span{
+        span {
             margin-left: 5px;
             color: #666;
             font-size: 14px;
         }
     }
     .trial {
-      margin-left: 28px;
-      border-radius: 6px;
+        margin-left: 28px;
+        border-radius: 6px;
     }
 }
 @media (max-width: 1680px) {
diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue
index 03dbf05..eddf59e 100644
--- a/src/pages/activity/list/index.vue
+++ b/src/pages/activity/list/index.vue
@@ -63,13 +63,17 @@
                             <span class="val">{{ item.initiator }}</span>
                           </div>
                         </template>
-                        <div class="m-t-20">
-                          <!-- <img src="@/assets/img/love1.png"
-                               alt=""> -->
-                          <img class="m-r-5"
-                               src="@/assets/img/love2.png"
+                        <div class="m-t-20"
+                             @click.stop="follow(item)">
+                          <template v-if="item.collectionStatus">
+                            <img class="m-r-5"
+                                 src="@/assets/img/love2.png"
+                                 alt="">
+                            {{ item.collectorsNum }}人关注
+                          </template>
+                          <img v-else
+                               src="@/assets/img/love1.png"
                                alt="">
-                          2人关注
                         </div>
                       </div>
                     </div>
@@ -208,22 +212,21 @@ export default {
     ]),
     getList () {
       this.clearTimer()
+      const { form } = this
       const data = {
         pageNum: this.page,
         pageSize: this.pageSize,
         platformSource: 2,
         keyWords: this.keyword,
-        ...this.form
+        ...form
       }
-      this.$post(this.api.schoolActivities, data).then(({ data }) => {
+      if (form.whetherToSignUp) data.whetherToSignUp = ''
+      this.$post(this.api[form.whetherToSignUp ? 'concernedActivity' : 'schoolActivities'], data).then(({ data }) => {
         const { records } = data
         this.listData = records
         this.totals = data.total
         this.handleStatus()
-        // this.loadIns.close();
-      }).catch(res => {
-        // this.loadIns.close()
-      })
+      }).catch(res => { })
     },
     // 定时处理时间及状态
     handleStatus () {
@@ -281,10 +284,10 @@ export default {
     getData () {
       // this.loadIns = Loading.service()
       this.getList()
-      // if (!Setting.isDev) {
-      clearInterval(this.redisTimer)
-      this.redisTimer = setInterval(this.getRedis, 1000)
-      // }
+      if (!Setting.isDev) {
+        clearInterval(this.redisTimer)
+        this.redisTimer = setInterval(this.getRedis, 1000)
+      }
     },
     initData () {
       this.page = 1
@@ -320,6 +323,12 @@ export default {
       this.page = val;
       this.getData();
     },
+    // 关注
+    follow ({ id, collectionStatus }) {
+      this.$post(`${this.api.collectionActivity}?activityId=${id}&state=${collectionStatus ? 0 : 1}`).then(res => {
+        this.getData()
+      }).catch(res => { })
+    },
 
     // 报名提交
     signupSubmit () {
diff --git a/src/pages/activity/manage/list/index.vue b/src/pages/activity/manage/list/index.vue
index fc438c1..700cbc7 100644
--- a/src/pages/activity/manage/list/index.vue
+++ b/src/pages/activity/manage/list/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="wrap">
+    <breadcrumb ref="breadcrumb"
+                data="创业互动/我的项目"></breadcrumb>
     <div class="page">
       <h6 class="p-title">筛选</h6>
       <div class="tool mul">
@@ -152,7 +154,9 @@ import util from "@/libs/util";
 import Setting from "@/setting";
 import { mapMutations } from "vuex";
 import { Loading } from 'element-ui'
+import breadcrumb from '@/components/breadcrumb'
 export default {
+  components: { breadcrumb },
   data () {
     return {
       timer: null,
@@ -326,10 +330,10 @@ export default {
     },
     getData () {
       this.getList()
-      // if (!Setting.isDev) {
-      clearInterval(this.redisTimer)
-      this.redisTimer = setInterval(this.getRedis, 1000)
-      // }
+      if (!Setting.isDev) {
+        clearInterval(this.redisTimer)
+        this.redisTimer = setInterval(this.getRedis, 1000)
+      }
     },
     add () {
       this.$router.push("add");
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index affc78c..599a581 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="wrap">
-    <breadcrumb :data="'实验台/' + curriculumName"></breadcrumb>
+    <breadcrumb ref="breadcrumb"
+                :data="'实验台/' + courseName"></breadcrumb>
     <div class="flex">
       <div class="cover"
            :class="{'is-word': showMask1}">
@@ -152,15 +153,15 @@
          :class="{active: item.id == active}"
          @click="tabChange(item)">{{ item.name }}</a>
     </div>
-    <div class="tab-content">
-      <template v-if="active === 1">
-        <div class="page">
+    <div class="flex">
+      <div class="tab-content">
+        <div v-if="active === 1"
+             class="page">
           <p class="intro"
              v-html="briefIntroduction"></p>
         </div>
-      </template>
-      <template v-if="active === 2">
-        <div class="page">
+        <div v-if="active === 2"
+             class="page">
           <template v-if="showNoteAdd">
             <el-form class="form"
                      ref="form"
@@ -223,9 +224,8 @@
             </el-timeline>
           </template>
         </div>
-      </template>
-      <template v-if="active === 4">
-        <div class="page">
+        <div v-if="active === 4"
+             class="page">
           <quill ref="quill"
                  :border="true"
                  v-model="comment"
@@ -238,9 +238,10 @@
           </div>
           <ul class="msg">
             <li v-for="(item, i) in comments"
-                :key="i">
+                :key="i"
+                :id="'comment' + item.commentId">
               <div class="li-wrap">
-                <img :src="item.avatar"
+                <img :src="item.createUserAvatars"
                      alt=""
                      class="avatar">
                 <div class="texts">
@@ -248,13 +249,14 @@
                     <span class="name">{{ item.createUsername }}</span>
                     发表于 {{ item.createTime }}
                   </h6>
-                  <div class="des"
+                  <div class="m-t-8"
                        v-html="item.content"></div>
                 </div>
                 <div class="action">
                   <i class="icon el-icon-chat-dot-square"
                      @click="showReplay(item)"></i>
-                  <i class="icon el-icon-delete"
+                  <i v-if="deleteIdentity || item.currentAccountId == item.createAccountId"
+                     class="icon el-icon-delete"
                      @click="delComment(item)"></i>
                   <img v-if="item.isLike"
                        class="icon"
@@ -266,6 +268,7 @@
                        src="@/assets/img/like.png"
                        alt=""
                        @click="like(item)">
+                  {{ item.likeCount || '' }}
                 </div>
               </div>
               <div class="reply"
@@ -283,32 +286,42 @@
               <ul class="msg children"
                   v-if="item.showChildren">
                 <li v-for="(reply,i) in item.children"
-                    :key="i">
+                    :key="i"
+                    :id="'comment' + reply.commentId">
                   <div class="li-wrap">
                     <img class="avatar"
-                         :src="reply.avatar"
+                         :src="reply.createUserAvatars"
                          alt="">
                     <div class="texts">
                       <div class="name">{{reply.createUsername}}</div>
-                      <div class="des"
-                           v-html="reply.content"></div>
+                      <div class="flex m-v-8">
+                        <template v-if="reply.showReplyName">
+                          回复
+                          <span class="reply-name">@{{ reply.replyUsername }}：</span>
+                        </template>
+                        <div class="des"
+                             v-html="reply.content"></div>
+                      </div>
                       <div class="date">{{reply.createTime}}</div>
                     </div>
                     <div class="action">
                       <i class="icon el-icon-chat-dot-square"
                          @click="showReplay(reply)"></i>
-                      <i class="icon el-icon-delete"
+                      <i v-if="deleteIdentity || reply.currentAccountId == reply.createAccountId"
+                         class="icon el-icon-delete"
                          @click="delComment(reply)"></i>
-                      <img v-if="reply.isLike"
-                           class="icon"
-                           src="@/assets/img/like-up.png"
-                           alt=""
-                           @click="like(reply)">
+                      <template v-if="reply.isLike">
+                        <img class="icon"
+                             src="@/assets/img/like-up.png"
+                             alt=""
+                             @click="like(item, reply)">
+                        {{ reply.likeCount }}
+                      </template>
                       <img v-else
                            class="icon"
                            src="@/assets/img/like.png"
                            alt=""
-                           @click="like(reply)">
+                           @click="like(item, reply)">
                     </div>
                   </div>
                   <div class="reply"
@@ -325,12 +338,37 @@
                   </div>
                 </li>
               </ul>
-              <div v-if="item.getCommentReplyNum"
-                   class="toggle"><span @click="item.showChildren = !item.showChildren">{{item.showChildren ? '收起所有回复' : `查看所有${item.getCommentReplyNum}条回复`}} <i class="el-icon-arrow-down"></i></span></div>
+              <div v-if="item.children"
+                   class="toggle"><span @click="item.showChildren = !item.showChildren">{{item.showChildren ? '收起所有回复' : `查看所有${item.children.length}条回复`}} <i class="el-icon-arrow-down"></i></span></div>
             </li>
           </ul>
         </div>
-      </template>
+      </div>
+      <div class="rank">
+        <el-select style="width: 100%"
+                   v-model="archProject"
+                   placeholder="请选择"
+                   @change="getMaximumScore">
+          <el-option v-for="(item, i) in progressList"
+                     :key="i"
+                     :label="item.projectName"
+                     :value="item.projectId"></el-option>
+        </el-select>
+        <div v-if="maximumScores.length"
+             class="arches">
+          <div v-for="(item, i) in maximumScores"
+               :key="i"
+               class="line">
+            <div>
+              <img :src="item.userAvatars"
+                   alt=""
+                   class="avatar">
+              <span class="name">{{ item.userName }}</span>
+            </div>
+            <span class="point">{{ item.highestScore }}分</span>
+          </div>
+        </div>
+      </div>
     </div>
 
     <el-dialog title="请选择项目"
@@ -391,12 +429,14 @@ export default {
   components: { pdf, breadcrumb, pdfDia, quill, Editor },
   data () {
     return {
-      mallId: this.$route.query.mallId || '',
+      mallId: '',
+      courseId: '',
+      curriculumName: '',
+      commentId: '', // 从右上角消息通知点进来用来定位评论的
+      notifyId: '',
       editorConfig,
       startTime: Date.now(), // 页面进来的时间
       systemIds: '',
-      courseId: +this.$route.query.courseId,
-      curriculumName: this.$route.query.curriculumName,
       type: 1,
       video: "http://liuwanr.oss-cn-shenzhen.aliyuncs.com/mp4/20200519/1589871025648.mp4",
       chapterList: [], // 章节列表
@@ -417,10 +457,10 @@ export default {
           id: 2,
           name: '课程笔记'
         },
-        {
-          id: 3,
-          name: '全国排行榜'
-        },
+        // {
+        //   id: 3,
+        //   name: '全国排行榜'
+        // },
         {
           id: 4,
           name: '教学互动'
@@ -465,6 +505,10 @@ export default {
       },
       comments: [],
       comment: '',
+      deleteIdentity: false,
+      archProject: '',
+      curReplyId: '',
+      maximumScores: []
     };
   },
   computed: {
@@ -473,6 +517,17 @@ export default {
     ])
   },
   watch: {
+    '$route': {
+      handler () {
+        this.mallId = this.$route.query.mallId || ''
+        this.courseId = +this.$route.query.courseId
+        this.curriculumName = this.$route.query.curriculumName
+        this.commentId = this.$route.query.commentId // 从右上角消息通知点进来用来定位评论的
+        this.notifyId = this.$route.query.notifyId
+        this.init()
+      },
+      immediate: true
+    },
     noteKeyword: function (val) {
       clearTimeout(this.searchTimer);
       this.searchTimer = setTimeout(() => {
@@ -481,24 +536,7 @@ export default {
     }
   },
   mounted () {
-    this.insertScript();
-    this.getData();
-    this.addRecord()
-    this.getNote()
-    this.getComment()
-    var arr6 = [1, 2, [3, 4, [5, 6]]];
-    function flatten (arr) {
-      var result = [];
-      for (var i = 0; i < arr.length; i++) {
-        if (Array.isArray(arr[i])) {
-          result = result.concat(flatten(arr[i]))
-        } else {
-          result.push(arr[i]);
-        }
-      }
-      return result;
-    }
-    console.log(11, flatten(arr6))
+    this.init()
   },
   destroyed () {
     // 记录播放时长
@@ -512,9 +550,17 @@ export default {
     goBack () {
       this.$router.push('/station')
     },
+    init () {
+      this.insertScript();
+      this.getData();
+      this.addRecord()
+      this.getNote()
+      this.getComment()
+    },
     async getData () {
       let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
       this.courseName = data.curriculumName;
+      this.$refs.breadcrumb.update('实验台/' + data.curriculumName)
       // this.coverUrl = data.coverUrl;
       this.briefIntroduction = data.briefIntroduction;
       this.teachingObjectives = data.teachingObjectives;
@@ -541,17 +587,29 @@ export default {
     async getChapter () {
       let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
       this.chapterList = res.chapterList;
-      if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) {
-        this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
+      if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
+        // this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
       }
     },
     // 获取学习进度
     async getProgress () {
       let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}`);
       this.progressList = res.list
+      if (res.list.length) this.archProject = res.list[0].projectId
+      this.maximumScores.length || this.getMaximumScore()
       this.plan = res.plan
       this.schedule = +(res.schedule.replace('%', ''))
     },
+    // 获取最高分列表
+    async getMaximumScore () {
+      let { message } = await this.$post(`${this.api.maximumPracticeScoreList}?projectId=${this.archProject}&pageNum=1&pageSize=1000`);
+      const list = message.records
+      list.forEach(e => {
+        if (!e.userAvatars) e.userAvatars = 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
+      })
+      this.maximumScores = list
+      console.log("🚀 ~ file: index.vue:604 ~ getMaximumScore ~ this.maximumScores:", this.maximumScores)
+    },
     // 进度数字自定义
     percentFormat (val) {
       return this.plan
@@ -612,21 +670,41 @@ export default {
       this.$get(this.api.commentTreeList, {
         cid: this.courseId,
       }).then(res => {
+        this.deleteIdentity = res.deleteIdentity
         const list = res.rootComments
         this.handleComments(list)
-        // console.log("🚀 ~ file: index.vue:590 ~ getComment ~ list:", list, l)
         this.comments = list
+        this.$nextTick(async () => {
+          if (this.curReplyId) {
+            const el = document.querySelector('#comment' + this.curReplyId)
+            el && el.scrollIntoView(false)
+          }
+          if (this.commentId) {
+            this.active = 4
+            const el = document.getElementById('comment' + this.commentId)
+            el && el.scrollIntoView(false)
+            await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${this.notifyId}`) // 从消息通知点进来的则加载完后调已读接口
+            this.commentId = ''
+          }
+        })
       }).catch(res => { })
     },
     // 递归处理评论参数
-    handleComments (list) {
-      list.forEach(e => {
-        if (!e.avatar) e.avatar = 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
-        e.getCommentReplyNum = e.children && e.children.length
+    handleComments (list, parent = {}) {
+      list.forEach((e, i) => {
+        if (!e.createUserAvatars) e.createUserAvatars = 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
         e.showChildren = false
+        if (e.commentId == this.commentId) parent.showChildren = true
+        if (e.commentId == this.curReplyId) e.showChildren = true
         e.showReply = false
         e.replyContent = ''
-        e.children && this.handleComments(e.children)
+        if (e.children && e.children.length && parent.children) {
+          e.children.forEach(n => n.showReplyName = true)
+          // parent.children.splice(i, 0, ...e.children)
+          parent.children.push(...e.children)
+          console.log("🚀 ~ file: index.vue:705 ~ list.forEach ~ parent:", parent, e.children)
+        }
+        e.children && this.handleComments(e.children, parent.commentId ? parent : e)
       })
     },
     // 回复
@@ -651,16 +729,20 @@ export default {
       this.$post(this.api.addComment, {
         cid: this.courseId,
         content,
-        pid: row ? row.commentId : 0
+        pid: reply ? reply.commentId : row ? row.commentId : 0,
+        replyAccountId: reply ? reply.createAccountId : row.createAccountId || '',
+        status: row ? 2 : 1
       }).then(res => {
         this.comment = ''
+        this.curReplyId = row ? row.commentId : ''
         this.getComment()
       }).catch(res => { })
     },
     // 评论点赞
-    like (row) {
-      this.$post(`${this.api[row.isLike ? 'unlike' : 'commentAndLike']}?commentId=${row.commentId}`).then(res => {
-        row.isLike = row.isLike ? 0 : 1
+    like (row, reply) {
+      this.$post(`${this.api[(reply ? reply.isLike : row.isLike) ? 'unlike' : 'commentAndLike']}?commentId=${reply ? reply.commentId : row.commentId}`).then(res => {
+        this.curReplyId = row.commentId
+        this.getComment()
       }).catch(res => { })
     },
 
@@ -897,7 +979,7 @@ export default {
         // python系统
         this.toPython(this.curProject)
       }
-    }
+    },
   }
 };
 </script>
@@ -913,7 +995,6 @@ $height: 700px;
     border: 0;
 }
 .page {
-    margin: 12px 0;
     .intro {
         font-size: 14px;
         color: #333;
@@ -989,7 +1070,7 @@ $height: 700px;
                 margin-right: 10px;
             }
             &:hover {
-                background-color: #528adf;
+                background-color: #377be3;
             }
             &.active {
                 background-color: $main-color;
@@ -1260,7 +1341,7 @@ $height: 700px;
 .tabs {
     display: flex;
     align-items: center;
-    margin-top: 10px;
+    margin: 10px 0;
     .item {
         padding: 0 10px;
         margin-right: 16px;
@@ -1277,7 +1358,31 @@ $height: 700px;
     }
 }
 .tab-content {
-    width: 80%;
+    width: calc(100% - 308px);
+}
+.rank {
+    width: 296px;
+    padding: 20px;
+    margin-left: 12px;
+    background-color: #fff;
+    .arches {
+        margin-top: 20px;
+    }
+    .line {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 10px;
+    }
+    .avatar {
+        width: 35px;
+        height: 35px;
+        margin-right: 10px;
+    }
+    .point {
+        font-weight: 600;
+        color: #007eff;
+    }
 }
 @media (max-width: 1430px) {
     .wrap {
diff --git a/src/setting.js b/src/setting.js
index e4caee4..3091bf7 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -28,8 +28,8 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    // host = "http://192.168.31.151:9000/"; // 榕
-    host = "http://192.168.31.53:9000/"; // 赓
+    // host = "http://192.168.31.152:9000/"; // 榕
+    // host = "http://192.168.31.53:9000/"; // 赓
 }
 
 const Setting = {
diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss
index de8b86d..30e445a 100644
--- a/src/styles/page/station.scss
+++ b/src/styles/page/station.scss
@@ -22,8 +22,8 @@
                     color: rgba(0, 0, 0, 0.85);
                     font-size: 16px;
                 }
-                .des {
-                    margin: 8px 0;
+                .reply-name {
+                    color: #007eff;
                 }
                 .date {
                     color: rgba(0, 0, 0, 0.45);
@@ -33,7 +33,7 @@
             .action {
                 display: inline-flex;
                 align-items: center;
-                margin-top: 15px;
+                margin: 15px 10px 0 0;
                 .icon {
                     margin: 0 5px;
                     color: $main-color;