Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/components/HomePage/courseList.vue

@@ -15,7 +15,12 @@
                 <course-image width="254px" height="144px" :course="item.info"></course-image>
             </div>
             <div class="data-cen pointer" @click="jumpDetail(item)">
-                <h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}} <span class="score-info" v-if="toScore(item.info.lastScore) > 0">{{toScore(item.info.lastScore)}}分</span> </h6>
+                <h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}}  
+                  <span class="sysType-name" v-if="item.info.sysType1 !='' && item.info.sysType1 != 0">{{sysTypeName(item.info.sysType1)}}</span>
+                  <span class="sysType-name" v-if="item.info.sysType2 !='' && item.info.sysType2 != 0">{{sysTypeName(item.info.sysType2)}}</span>
+                  <span class="sysType-name" v-if="item.info.sysType3 !='' && item.info.sysType3 != 0">{{sysTypeName(item.info.sysType3)}}</span>
+                   <span class="score-info" v-if="toScore(item.info.lastScore) > 0">{{toScore(item.info.lastScore)}}分</span>
+                </h6>
                 <p class="title-info">{{item.info.summary}}</p>
                 <div class="pro-line"> <div>当前进度：</div> <div style="width:200px"><el-progress :percentage="item.info.progress"></el-progress></div></div>
                 <p class="portal-time">最新一次学习时间：{{item.eventTime}}</p>
@@ -55,7 +60,7 @@
               }
           },
           computed:{
-        ...mapGetters(['curIdentity','identity','userInfo']),
+            ...mapGetters(['curIdentity','identity','userInfo','sysTypeMap']),
           },
           components: {
             courseImage,
@@ -82,6 +87,10 @@
             this.pageId = this.$xpage.getHomeId(this.$route);
           },
           methods:{
+            sysTypeName(code){
+              if(code==''){return '';}
+              return this.sysTypeMap.get(code);
+            },
             emitHide(id) {
               this.$emit('hideIndex',id)
             },
@@ -111,6 +120,18 @@
             margin: 0;
             font-size: 18px !important;
             line-height: 25px;
+            .sysType-name{
+              display: inline-block;
+              padding:0px 8px;
+              // margin-top: 5px;
+              line-height: 24px;
+              font-size: 12px;
+              border-radius:2px;
+              margin-right: 8px;
+              color: #2C68FF;
+              height: 24px;
+              background: rgba(44,104,255,0.06);
+            }
         }
         .title-info{
             font-size: 14px;

src/components/Portal/guideBox.vue

@@ -17,13 +17,13 @@
          <div class="gui-box-right">
           <div id="container" style="z-index:99;" >
          <!-- 当轮播图等于一张时 -->
-            <swiper :options="swiperOptiontwo" v-if="resonimgTow.length">
+            <swiper :options="swiperOptiontwo" ref="mySwiper" v-if="resonimgTow.length">
               <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimgTow" :key="'a'+idx" class="swiper-slide games">
                 <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.img" alt="">
               </swiper-slide>
             </swiper>
           </div>
-            <div id="guideBox" style="z-index:99;">
+            <div id="guideBox" style="z-index:99;" v-if="resonimg.length > 1">
               <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length">
                 <swiper-slide  style="margin: 0 auto;" v-for="(item, idx ) in resonimg" :key="item.id" class="swiper-slide games">
                     <img class="banner-img" style=" margin: 0 auto;" :src="fileBaseUrl + item.img" alt="">
@@ -71,8 +71,8 @@
                 delay: 2000,
                 },
                 speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
-                loop:true, //循环切换
+                initialSlide:1,
-                observe:true,
+                loop:false, //循环切换
                 peed: 300,//循环速度
                 scrollbar: '.swiper-scrollbar',
                 pagination: {
@@ -90,7 +90,6 @@
     created() {
       //这里的以后要去掉的，不应该是这样计算的
       let width = document.body.clientWidth;
-      console.log(width,'width');
       if(width > 1921) {
         this.dlgWidth = '1088px';
         this.leftWidth='220px';
@@ -121,6 +120,7 @@
     },
     mounted() {
         this.getlist();
+        // this.swiper.slideTo(3,2000,false);
     },
     methods:{
         show(){
@@ -152,7 +152,6 @@
             } else {
               this.resonimgTow = item.images;
             }
-            
           }
         },
         notYet() {