首页加两个模块，日志修复等

src/api/index.js

@@ -1,9 +1,8 @@
 import Setting from "@/setting";
 
 let host = Setting.apiBaseURL;
+const host1 = 'http://192.168.31.137:9000'
 let uploadURL = "http://39.108.250.202:9000/";
-let loginhost = `${Setting.apiBaseURL}liuwanr/`;
-
 
 export default {
     host,
@@ -14,12 +13,12 @@ export default {
     logoDetail: `${host}occupationlab/sys/logo/detail`, //查看系统设置信息
     isClient: `${host}users/users/user/isClient`,
 
+    platformLogList: `${host1}/nakadai/log/platformLogList`,
     //实验台
     curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
     curriculumChapter: `${host}nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
     curriculumGetSubsection: `${host}nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址
 
-
     // 能力测评
     canExperiment: `${host}occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验
     experimentDetail: `${host}occupationlab/occupationlab/evaluationrecord/detail`, // 成绩详情
@@ -91,16 +90,6 @@ export default {
     bindPhoneOrEmail: `${host}users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱
     sendPhoneOrEmailCode: `${host}users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码
 
-
-
-
-
-
-
-
-
-
-
     joinPractice: `${host}tms/classTech/joinPractice`, //通过邀请码进入实验
     queryArchievement: `${host}tms/classTech/queryExperimentalReport`, //查看教学实验报告
     queryVirtualReport: `${host}tms/classTech/queryVirtualReport`, //查看虚仿实验报告

src/layouts/navbar/index.vue

@@ -63,6 +63,10 @@ export default {
                     index: "/devPlatform/list",
                     title: "开发者平台"
                 },
+                {
+                    index: "/log",
+                    title: "有什么新功能"
+                }
             ],
             menus: []
         };

src/pages/index/list/index.vue

@@ -149,6 +149,41 @@
                 </div>
             </div>
         </div>
+        <div class="product bg-white">
+            <div class="inner">
+                <div class="pics">
+                    <div class="pro-bg4">
+                        <img src="@/assets/img/index/pro-bg3-4.png" alt="" class="bg1 wow fadeInDown" data-wow-delay="0.6s">
+                        <img src="@/assets/img/index/pro-bg3-5.png" alt="" class="bg2 wow fadeInDown" data-wow-delay="0.7s">
+                        <img src="@/assets/img/index/pro-bg4-1.png" alt="" class="bg3 wow fadeInDown" data-wow-delay="0.2s">
+                        <img src="@/assets/img/index/pro-bg4-2.png" alt="" class="bg4 wow fadeInDown" data-wow-delay="0.2s">
+                        <img src="@/assets/img/index/pro-bg4-3.png" alt="" class="bg5 wow fadeInDown" data-wow-delay="0.6s">
+                    </div>
+                    <div class="text">
+                        <img src="@/assets/img/index/index21.png" alt="" class="icon wow fadeInLeft" data-wow-delay="0.5s">
+                        <h6 class="wow fadeInUp" data-wow-delay="0.5s">共享精品课程资源</h6>
+                        <p class="desc wow fadeInUp" data-wow-delay="0.5s">学校可自主打造自己的精品课程中心，老师可以在这里创建优质的课程，支持视频，课件，教案等不同格式的教学资源上传，让全校师生共同学习一起分享。</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="product bg-white">
+            <div class="inner">
+                <div class="pics">
+                    <div class="text">
+                        <img src="@/assets/img/index/index22.png" alt="" class="icon wow fadeInLeft" data-wow-delay="0.5s">
+                        <h6 class="wow fadeInUp" data-wow-delay="0.5s">自定义赛事活动</h6>
+                        <p class="desc wow fadeInUp" data-wow-delay="0.5s">学校可自行发布各种比赛活动的信息和活动进展，供全校学生参加报名，给学生提供一个展示自我，挑战自我的舞台，丰富学生的校园生活。</p>
+                    </div>
+                    <div class="pro-bg5">
+                        <img src="@/assets/img/index/pro-bg3-4.png" alt="" class="bg1 wow fadeInDown" data-wow-delay="0.6s">
+                        <img src="@/assets/img/index/pro-bg3-5.png" alt="" class="bg2 wow fadeInDown" data-wow-delay="0.7s">
+                        <img src="@/assets/img/index/pro-bg5-1.png" alt="" class="bg3 wow fadeInDown" data-wow-delay="0.2s">
+                        <img src="@/assets/img/index/pro-bg5-2.png" alt="" class="bg4 wow fadeInDown" data-wow-delay="0.2s">
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -534,6 +569,86 @@ export default {
                 }
             }
         }
+        .pro-bg4 {
+            position: relative;
+            width: 580px;
+            height: 360px;
+            img {
+                position: absolute;
+                transition: .5s;
+            }
+            .bg1 {
+                top: 0;
+                left: 0;
+            }
+            .bg2 {
+                bottom: -40px;
+                right: -20px;
+                animation: rotate 10s linear infinite;
+            }
+            .bg3 {
+                top: 40px;
+                left: 30px;
+                width: 530px;
+            }
+            .bg4 {
+                top: -20px;
+                left: 80px;
+                width: 140px;
+            }
+            .bg5 {
+                bottom: 0px;
+                left: 50px;
+                width: 130px;
+            }
+            &:hover {
+                .bg3 {
+                    transform: scale(1.1);
+                }
+                .bg4 {
+                    transform: translate(40px, 0px);
+                }
+                .bg5 {
+                    transform: translate(20px, -60px) scale(1.2);
+                }
+            }
+        }
+        .pro-bg5 {
+            position: relative;
+            width: 580px;
+            height: 360px;
+            img {
+                position: absolute;
+                transition: .5s;
+            }
+            .bg1 {
+                top: 0;
+                left: 0;
+            }
+            .bg2 {
+                bottom: -40px;
+                right: -20px;
+                animation: rotate 10s linear infinite;
+            }
+            .bg3 {
+                top: 40px;
+                left: 30px;
+                width: 530px;
+            }
+            .bg4 {
+                top: 150px;
+                right: 40px;
+                width: 300px;
+            }
+            &:hover {
+                .bg3 {
+                    transform: scale(1.1);
+                }
+                .bg4 {
+                    transform: translate(-75px, 20px) scale(1.1);
+                }
+            }
+        }
     }
     .none{
         padding: 50px 0;

src/pages/info/list/index.vue

@@ -215,12 +215,21 @@ export default {
         /deep/ .el-menu {
             text-align: right;
             border-right: 0;
+            .el-submenu__icon-arrow {
+              display: none;
+            }
+            .el-submenu__title {
+              padding-right: 60px;
+              color: #1182f5;
+              background-color: #c6e7ff;
+            }
             .el-menu-item {
-                padding-right: 24px;
+                min-width: auto;
+                padding: 0 24px !important;
                 font-size: 16px;
                 color: #666;
                 border-bottom: 2px solid #f3f6fa;
-                    border-right: 2px solid transparent;
+                border-right: 2px solid transparent;
                 &:before {
                     content: '';
                     display: inline-block;

src/pages/log/list/index.vue

@@ -0,0 +1,109 @@
+<template>
+    <div class="wrap">
+        <el-timeline>
+            <el-timeline-item v-for="(item, i) in listData" :key="i" :timestamp="item.updateTime" placement="top" color="#007EFF">
+                <el-card>
+                    <h6>{{ platformList.find(e => e.id === item.platformId).name + item.versionName }}</h6>
+                    <img v-if="item.coverUrl" :src="item.coverUrl" alt="" class="cover">
+                    <ul class="detail">
+                      <li v-for="(item, i) in item.logContents" :key="i">
+                          <p class="name">{{ funcList.find(e => e.id === item.type).name }}</p>
+                          <div class="val">
+                            <p class="" v-for="(item, i) in item.content" :key="i">{{ item }}</p>
+                          </div>
+                      </li>
+                  </ul>
+                </el-card>
+            </el-timeline-item>
+        </el-timeline>
+    </div>
+</template>
+
+<script>
+import Setting from '@/setting'
+export default {
+    name: 'log',
+    data() {
+        return {
+            platformList: Setting.platformList,
+            listData: [],
+            funcList: [
+                {
+                    id: 0,
+                    name: '新功能'
+                },
+                {
+                    id: 1,
+                    name: '修复'
+                },
+                {
+                    id: 2,
+                    name: '优化'
+                }
+            ]
+        }
+    },
+    mounted() {
+        this.getData()
+    },
+    methods: {
+        getData() {
+            this.$get(`${this.api.platformLogList}?platformId=${Setting.platformId}&port=1&versionName=`).then(res => {
+              const { logList } = res
+              logList.map((e, i) => {
+                e.logContents.map(n => {
+                  n.content = n.content.split('\n')
+                })
+              })
+              this.listData = logList
+            }).catch(res => {})
+        },
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+    padding-top: 50px;
+    background-color: #fff;
+    /deep/.el-card__body {
+      padding-left: 30px;
+    }
+    h6 {
+      margin-bottom: 15px;
+      font-size: 18px;
+    }
+    .cover {
+        max-width: 400px;
+        margin: 10px 0 20px;
+    }
+    .detail {
+        li {
+            margin-bottom: 20px;
+        }
+        .name {
+            margin-bottom: 5px;
+            font-size: 14px;
+            color: $main-color;
+        }
+        .val {
+            font-size: 15px;
+            line-height: 1.8;
+            white-space: pre-wrap;
+            p {
+              position: relative;
+              &:before {
+                content: '';
+                position: absolute;
+                top: 11px;
+                left: -10px;
+                width: 5px;
+                height: 5px;
+                border-radius: 20px;
+                background-color: $main-color;
+              }
+            }
+        }
+    }
+}
+</style>

src/pages/match/details/index.vue

@@ -1,6 +1,9 @@
 <template>
     <div class="wrap index">
-        <div class="banner" :style="{backgroundImage: coverUrlComputed}"></div>
+        <div class="banner" :style="{backgroundImage: coverUrlComputed}">
+          <h6>竞赛详情</h6>
+          <p class="text">拼搏、突破、创新</p>
+        </div>
         <div class="center-wrap">
             <breadcrumb ref="breadcrumb" :data="'全部赛事/' + title"></breadcrumb>
             <div class="content">
@@ -192,8 +195,18 @@ export default {
 .banner{
     width: 100%;
     height: 350px;
+    padding: 120px 0 0 20%;
+    color: #fff;
     background-size: 100% 350px;
     background-repeat: no-repeat;
+    h6 {
+      margin-bottom: 30px;
+      font-size: 42px;
+    }
+    .text {
+      font-size: 20px;
+      line-height: 30px;
+    }
 }
 .main .center-wrap {
     margin-top: 30px;

src/pages/setting/person/index.vue

@@ -17,8 +17,7 @@
             </div>
         </div>
         <div class="right">
-            <info ref="info" v-if="active == 1" @updateStatus="updateStatus"></info>
+            <info ref="info" @updateStatus="updateStatus"></info>
-            <download v-else></download>
         </div>
     </div>
 </template>

src/pages/setting/person/info.vue

@@ -494,6 +494,7 @@ export default {
             }
             this.$post(this.api.updatePersonCenter,data).then(res => {
                 this.setUserName(form.userName);
+                this.$emit('updateStatus',false)
                 this.$message.success('提交成功！')
             }).catch(res => {})
         },

src/router/modules/log.js

@@ -0,0 +1,23 @@
+import BasicLayout from '@/layouts/home';
+
+const meta = {};
+
+const pre = 'log-';
+
+export default {
+    path: '/log',
+    name: 'log',
+    redirect: {
+        name: `${pre}list`
+    },
+    meta,
+    component: BasicLayout,
+    children: [
+        {
+            name: `${pre}list`,
+            path: `list`,
+            component: () => import('@/pages/log/list'),
+            meta: { title: '有什么新功能' }
+        },
+    ]
+};

src/router/routes.js

@@ -9,6 +9,7 @@ import setting from "./modules/setting";
 import course from "./modules/course";
 import info from "./modules/info";
 import match from "./modules/match";
+import log from "./modules/log";
 
 const frameIn = [
     {
@@ -25,7 +26,8 @@ const frameIn = [
     setting,
     course,
     info,
-    match
+    match,
+    log
 ];
 
 /**

src/setting.js

@@ -38,10 +38,10 @@ if (isHh) {
 } else if (isDev) {
     // 本地
     // host = "http://www.occupationlab.com:9000/";//线上
-    host = "http://39.108.250.202:9000/"; // 中台测试服
+    // host = "http://39.108.250.202:9000/"; // 中台测试服
     systemPath = `http://192.168.31.125:8093`
-    // host = "http://192.168.31.137:9000/"; // 赓
+    // host = "http://192.168.31.137:9000"; // 赓
-    // host = "http://192.168.31.151:9000/"; // 榕
+    host = "http://192.168.31.151:9000/"; // 榕
     title = "职站";
 } else {
     console.log("其它版本");
@@ -71,7 +71,24 @@ const Setting = {
     /**
      * 路由白名单
      * */
-    whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list'],
+    whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list', '/log/list'],
+    /**
+     * 平台列表
+     * */
+    platformList: [
+        {
+            id: 1,
+            name: '职站'
+        },
+        {
+            id: 2,
+            name: '数据平台'
+        },
+        {
+            id: 3,
+            name: '中台'
+        }
+    ],
     /**
      * 多语言配置
      * */