fix

11 months ago · 1b38df77d2
parent 0a9fcf47f3
commit 1b38df77d2
10 changed files with 110 additions and 88 deletions
--- a/public/index.html
+++ b/public/index.html
@ -3,21 +3,21 @@
    <head>
        <meta charset="utf-8" />
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="keywords" content="智信云,教学,教育,在线编程" />
+        <meta name="keywords" content="职站,教学,教育,在线编程" />
        <meta
            name="description"
-            content="智信云是一家为高等院校提供实验课程数字化服务的国家级高新技术企业。以区块链、大数据、人工智能等前沿技术在行业领域的运用为支撑，将新技术与经济与管理人才培养深度融合，面向全国高等院校的经济、金融、大数据应用等相关专业提供科研创新、金课建设、实验实训教学软件、实践教学以及学生就业培训为一体的专业建设咨询与技术支持服务。"
+            content="职站是一款辅助院校教师开展虚拟仿真实验教学的智能云实践平台。平台采用了大数据，云计算等技术，为学校搭建信息化平台提供了基础，可助力院校实现教学智能化升级。职站平台设计遵循着极简、高效的理念，可帮助老师轻松开展实验教学，并支持自定义发布考核和练习，智能统计和检验学生的日常实训练习效果；老师还可以通过可视化图表报告直观查看学生实训成绩，评估教学成果。"
        />
        <meta name="baidu-site-verification" content="code-TRfXe8xIkJ" />
-        <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-        <!-- <meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" /> -->
+        <!-- <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> -->
+        <meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" />
        <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css" />
-        <title>智信云</title>
+        <title>职站——为院校打造一站式虚拟仿真实训教学数智云平台</title>
        <script>
            var _hmt = _hmt || [];
            (function () {
                var hm = document.createElement('script');
-                hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654';
+                hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
                var s = document.getElementsByTagName('script')[0];
                s.parentNode.insertBefore(hm, s);
            })();
--- a/src/components/menuTree/index.vue
+++ b/src/components/menuTree/index.vue
@ -2,7 +2,7 @@
  <div>
    <template v-for="(item, i) in this.menuList">
      <el-submenu :key="item.id"
-                  :index="item.id"
+                  :index="item.id.toString()"
                  v-if="item.children && item.children.length">
        <template slot="title">
          <span slot="title">{{item.name}}</span>
@ -10,7 +10,7 @@
        <menuTree :menuList="item.children"></menuTree>
      </el-submenu>
      <el-menu-item :key="i"
-                    :index="item.id"
+                    :index="item.id.toString()"
                    v-else>
        <span slot="title">{{item.name}}</span>
      </el-menu-item>
--- a/src/pages/activity/manage/list/index.vue
+++ b/src/pages/activity/manage/list/index.vue
@ -365,7 +365,7 @@ export default {
    },
    handleCurrentChange (val) {
      this.page = val;
-      this.$router.push(`list?page=${val}`)
+      this.$router.push(`manage?page=${val}`)
      this.getData()
      this.setPage(val)
    },
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@ -153,6 +153,7 @@ export default {
      player: null,
      previewImg: '',
      iframeSrc: '',
+      videoSrc: '',
      isWord: false,
      isPPT: false,
      isExcel: false,
--- a/src/pages/course/list/index.vue
+++ b/src/pages/course/list/index.vue
@ -97,6 +97,7 @@
 import { Loading } from "element-ui";
 import Setting from "@/setting";
 import util from "@/libs/util"
+import qs from 'qs'
 export default {
  name: "course",
  data () {
@ -194,10 +195,6 @@ export default {
    getData () {
      this.loadIns = Loading.service()
      this.getList()
-      // if (!Setting.isDev) {
-      //   clearInterval(this.timer)
-      //   this.timer = setInterval(this.getRedis, 1000)
-      // }
    },
    initData () {
      this.page = 1;
@ -244,6 +241,7 @@ export default {
      }).catch(res => { })
    },
    toDetail (id) {
+      this.$store.commit('course/setReferrer', `${this.$route.path}?${qs.stringify(this.form)}&keyword=${this.keyword}&page=${this.page}`)
      this.$router.push(`/${this.isTourist ? 'preCourse' : 'course'}/details?id=${id}&source=${this.active}`);
    }
  }
--- a/src/pages/info/details/index.vue
+++ b/src/pages/info/details/index.vue
@ -1,22 +1,26 @@
 <template>
-    <div class="wrap">
-        <breadcrumb ref="breadcrumb" data="资讯" :query="breadcrumbQuery"></breadcrumb>
-        <div class="page">
-            <h6 class="title">{{title}}</h6>
-            <div class="metas">
-                <span>作者： {{author}}</span>
-                <el-divider direction="vertical"></el-divider>
-                <span>{{date.replace(' 00:00:00','')}}</span>
-                <el-divider direction="vertical"></el-divider>
-                <span>浏览量：{{viewCount}}</span>
-            </div>
+  <div class="wrap">
+    <breadcrumb ref="breadcrumb"
+                data="资讯"
+                :query="breadcrumbQuery"></breadcrumb>
+    <div class="page">
+      <h6 class="title">{{title}}</h6>
+      <div class="metas">
+        <span>作者： {{author}}</span>
+        <el-divider direction="vertical"></el-divider>
+        <span>{{date.replace(' 00:00:00','')}}</span>
+        <el-divider direction="vertical"></el-divider>
+        <span>浏览量：{{viewCount}}</span>
+      </div>

-            <div class="cover">
-                <img :src="coverUrl" alt="">
-            </div>
-            <div class="content ql-editor" v-html="content"></div>
-        </div>
+      <div class="cover">
+        <img :src="coverUrl"
+             alt="">
+      </div>
+      <div class="content ql-editor"
+           v-html="content"></div>
    </div>
+  </div>
 </template>
 <script>
 import { Loading } from 'element-ui';
@ -25,75 +29,75 @@ import 'quill/dist/quill.snow.css';
 import 'quill/dist/quill.bubble.css';
 import breadcrumb from '@/components/breadcrumb'
 export default {
-    data() {
-        return {
-            columnNames: this.$route.query.columnNames,
-            breadcrumbQuery: {
-              parentId: this.$route.query.parentId,
-              name: this.$route.query.name
-            },
-            id: this.$route.query.id,
-            coverUrl: '',
-            author: '',
-            date: '',
-            title: '',
-            content: '',
-            viewCount: 0,
-            loadIns: null
-        }
-    },
-    components: {
-        breadcrumb
-    },
-    mounted() {
-        this.getData()
-    },
-    methods: {
-        getData() {
-            this.loadIns = Loading.service()
-            this.$get(`${this.api.getArticle}?articleId=${this.id}`)
-                .then(res => {
-                    let data = res.article
-                    this.coverUrl = data.coverUrl
-                    this.author = data.author
-                    this.date = data.date
-                    this.title = data.title
-                    this.content = data.content
-                    this.viewCount = data.viewCount
-                    this.$forceUpdate()
-                    this.$refs.breadcrumb.update(`最新资讯/${this.$route.query.name}/${this.columnNames.split(',').join('/')}/${this.title}`)
-                    this.loadIns.close()
-                })
-                .catch(err => {
-                    this.loadIns.close()
-                });
-        },
+  data () {
+    return {
+      columnNames: this.$route.query.columnNames,
+      breadcrumbQuery: {
+        parentId: this.$route.query.parentId,
+        name: this.$route.query.name
+      },
+      id: this.$route.query.id,
+      coverUrl: '',
+      author: '',
+      date: '',
+      title: '',
+      content: '',
+      viewCount: 0,
+      loadIns: null
    }
+  },
+  components: {
+    breadcrumb
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () {
+      this.loadIns = Loading.service()
+      this.$get(`${this.api.getArticle}?articleId=${this.id}`)
+        .then(res => {
+          let data = res.article
+          this.coverUrl = data.coverUrl
+          this.author = data.author
+          this.date = data.date
+          this.title = data.title
+          this.content = data.content
+          this.viewCount = data.viewCount
+          this.$forceUpdate()
+          this.$refs.breadcrumb.update(`最新资讯/${this.$route.query.name}/${this.columnNames.split(',').join('/')}/${this.title}`)
+          this.loadIns.close()
+        })
+        .catch(err => {
+          this.loadIns.close()
+        });
+    },
+  }
 };
 </script>

 <style lang="scss" scoped>
 .wrap {
    padding-bottom: 20px;
-    .title{
+    .title {
        margin-top: 30px;
        text-align: center;
        font-size: 28px;
        font-weight: 500;
-        color: #0B1D30;
+        color: #0b1d30;
    }
-    .metas{
+    .metas {
        display: flex;
        justify-content: center;
        align-items: center;
        padding-bottom: 32px;
        margin: 16px 0 32px;
-        span{
+        span {
            display: inline-flex;
            align-items: center;
            color: #999;
            font-size: 12px;
-            img{
+            img {
                width: 18px;
                margin-right: 5px;
            }
@ -102,19 +106,19 @@ export default {
            margin: 0 16px;
        }
    }
-    .cover{
+    .cover {
        margin: 20px 0;
        text-align: center;
-        img{
+        img {
            width: 800px;
        }
    }
-    .content{
+    .content {
        padding: 0 150px;
        line-height: 1.8;
        font-size: 16px;
        text-indent: 2em;
-        /deep/img{
+        /deep/img {
            display: block;
            width: 600px;
            margin-left: auto;
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@ -1055,9 +1055,7 @@ export default {
        this.form.competitionStage && this.form.competitionStage.map(e => {
          // 如果成绩公布时间输入的值大于0（输入的是0则直接公布；没输入值则不公布）
          const time = e.resultAnnouncementTime
-          if (time === 0) {
-            info.stages.find(n => n.stageId == e.stageId).showDetail = 1
-          } else if (time) {
+          if (time >= 0) {
            const endTime = new Date(e.endTime).getTime() + time * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒）
            console.log("🚀 ~ this.$post ~ endTime:", time, endTime - now)
            if (now > endTime) { // 如果到了公布时间
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@ -63,8 +63,8 @@ export default {
    return {
      isZj: location.host === '10.60.32.76', // 浙江万里
      isSq: Setting.isSq,
-      keyword: "",
-      active: 0,
+      keyword: this.$route.query.keyword || '',
+      active: +this.$route.query.active || 0,
      tabs: [
        {
          id: 0,
@ -95,7 +95,7 @@ export default {
        }).catch(err => { })
    },
    goPreview (item) {
-      this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}`);
+      this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`);
    },
    // tab切换
    tabChange (item) {
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@ -1,7 +1,11 @@
 <template>
  <div class="wrap">
    <breadcrumb ref="breadcrumb"
-                :data="'实验台/' + (curriculumName || courseName)"></breadcrumb>
+                :data="'实验台/' + (curriculumName || courseName)"
+                :query="{
+									keyword: this.$route.query.keyword || '',
+									active: this.$route.query.active || 0,
+								}"></breadcrumb>
    <div class="flex">
      <div class="cover"
           :class="{'is-word': showMask1}">
--- a/src/store/modules/course.js
+++ b/src/store/modules/course.js
@ -0,0 +1,17 @@
+/**
+ * 课程相关
+ * */
+export default {
+    namespaced: true,
+    state: {
+      referrer: '',
+    },
+    mutations: {
+      setReferrer: (state, val) => {
+        state.referrer = val
+      },
+    },
+    actions: {
+      
+    }
+};