Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

src/api/phase2/yearMedal.js

@@ -0,0 +1,17 @@
+/**文章模块的相关处理*/
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax'
+const baseURL =process.env.VUE_APP_STAT_BASE_API;
+
+const has2023 = function() {
+    return ajax.get(baseURL,'/xboe/m/stat/year/medal/has');
+}
+
+const save2023 = function() {
+    return ajax.get(baseURL,'/xboe/m/stat/year/medal/save');
+}
+
+export default {
+    has2023,
+    save2023
+}

src/components/AlertPopup.vue

@@ -6,7 +6,7 @@
         <div style="text-align: center;position: relative;">
           <!-- <span style="float: right;" @click="pop.show = false"><i style="font-size: 28px;color: #000000;" class="el-icon-close"></i></span> -->
           <el-image :src="baseUrl+pop.bgImage"></el-image>
-          <div>
+          <div style="margin-top: 30px;">
             <span v-if="pop.closeable" class="dlg-close" @click="pop.show = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
           </div>
         </div>

src/components/Popup/Medal2023.vue

@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <el-dialog :close-on-press-escape="false" :close-on-click-modal="false"  class="medalbox"  :visible.sync="show"  :append-to-body="true" >
+        <div style="text-align: center;position: relative;">
+          <el-image :src="`${webBaseUrl}/images/medal/20230101.png`"></el-image>
+          <div class="dlg-boot">
+            <span  class="dlg-close" @click="show = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
+          </div>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import apiYearMedal from '@/api/phase2/yearMedal.js';
+  export default{
+    data() {
+      return {
+        show:false,
+        baseUrl:process.env.VUE_APP_FILE_BASE_URL
+      };
+    },
+    mounted() {
+
+       let now=new Date();
+       let min=new Date(2022,11,1,0,0,0);
+       let max=new Date(2023,1,15,0,0,0);
+       //console.log(now,min,max);
+       //console.log(now.getTime(),min.getTime(),max.getTime());
+       if(now.getTime()<max.getTime()){
+         //console.log('open')
+         apiYearMedal.has2023().then(rs=>{
+            if(rs.status==200){
+              if(!rs.result){
+                this.show=true;
+                apiYearMedal.save2023();
+              }
+            }
+         })
+       }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+.dlg-boot{
+  height: 50px;
+  margin-top: 30px;
+}
+.dlg-close{
+    //float: right;
+    //margin-top: -90px;
+    border: 1px solid #cccccc;
+    border-radius: 50%;
+
+    padding: 20px 10px 10px 10px;
+    cursor: pointer;
+  }
+  .jinian-medal-img{
+    text-align: center;
+    padding-top: 10px;
+  }
+  .medalbox {
+    background: transparent !important;
+    ::v-deep .el-dialog{
+      background: transparent !important;
+      box-shadow:none !important;
+      .el-dialog__header{
+         display: none !important;
+      }
+      .el-dialog__body{
+        //  width: 320px !important;
+        //  height: 420px !important;
+        background: transparent !important;
+      }
+    }
+  }
+</style>

src/components/PortalHeader.vue

@@ -124,13 +124,14 @@
           </div>
         </div>
     </div>
-    <popup></popup>
+    <popup></popup><yearMedal></yearMedal>
   </div>
 </template>
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import apiMessage from '@/api/system/message.js';
 import popup from '@/components/AlertPopup.vue';
+import yearMedal from '@/components/Popup/Medal2023.vue';
 import apiBoeCourse from '@/api/boe/course.js';
 import {userAvatarText} from "@/utils/tools.js";
 export default {
@@ -153,7 +154,7 @@ export default {
     }
   },
 
-  components:{popup},
+  components:{popup,yearMedal},
   computed: {
     ...mapGetters(['userInfo', 'userMsg','identity','studyTaskCount']),
 
@@ -184,7 +185,7 @@ export default {
     //this.loadPopupConfig();
   },
   methods: {
-    
+
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);
       },

src/components/UserCenter/menu.vue

@@ -27,6 +27,9 @@
           <el-menu-item index="/examine/notapproved">
               <span class="textl"><el-badge :value="messagesBeReviewed" class="item" :hidden="messagesBeReviewed == 0">待审核的课程</el-badge></span>
           </el-menu-item>
+          <!-- <el-menu-item index="/course/opencourse/audit">
+              <span class="textl">公开课审核</span>
+          </el-menu-item> -->
         </el-submenu>
         <el-submenu index="manageFinish" v-show="curIdentity == 3">
           <template slot="title">

src/data/pages.js

@@ -32,6 +32,7 @@ export const pages=[
     {title:'课程统计',path:'stat',component:'course/StatIndex',hidden:false},
     {title:'课件管理',path:'courseware',component:'course/Courseware',hidden:false},
     {title:'报名管理',path:'msignup',component:'study/ManageSignup',hidden:true},
+    {title:'公开课审核',path:'opencourse/audit',component:'course/OpenCourseAudit',hidden:true},
   ]},
   {title:'业务管理',path:'/manage',hidden:false,children:[
     {title:'教师管理',path:'teachers',component:'manage/TeacherList',hidden:false},

src/store/modules/user.js

@@ -157,12 +157,16 @@ const user = {
                         showHome:res.result.showHome,
                         companyId:res.result.companyId,
                         departId: res.result.departId,
+                        adminType:0,
                         departName: res.result.departName,
                         departFullName: dfn,
                         studyTotal: res.result.studyTotal,
                         studyTotalH:studyTotalH,
                         sign:res.result.sign,
                     };
+                    if(res.result.adminType){
+                       user.adminType=res.result.adminType;
+                    }
                     //console.log(user,'user');
                     // user.avatar = user.avatar == "" ? require("@/assets/images/user/default.png") : process.env.VUE_APP_FILE_BASE_URL + user.avatar;
                     user.avatar = user.avatar == "" ? "" : process.env.VUE_APP_FILE_BASE_URL + user.avatar;

src/views/Index.vue

@@ -534,7 +534,7 @@
         ],
         lastStudy:{},
         overlayShow:false,
-        userData: {  uvalue:0, totalStudyHour:0},
+        userData: {level:1,  uvalue:0, totalStudyHour:0},
         userHobby:{
           needShow:false,
           localKeyPre:'user-hobby-' //本地存储的key

src/views/course/OpenCourseAudit.vue

@@ -0,0 +1,9 @@
+<template>
+  <!--公开课审核-->
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/medal/Index.vue

@@ -7,7 +7,7 @@
           <el-tab-pane label="社交勋章" name="third"></el-tab-pane>
           <el-tab-pane label="成就勋章" name="fourth"></el-tab-pane>
       </el-tabs>
-      <div class="medal-list" v-if="medalData.length > 0">
+      <div class="medal-list" v-if="medalData.length > 0 || year2023">
             <div v-for="item in medalData" :key="item.id">
                 <div class="medal-index" v-if="item.medalId != 5">
                     <medal-img :item="item"></medal-img>
@@ -22,6 +22,11 @@
                 <!-- <p class="index-text">您已超过{{item.exceed}}人</p> -->
                 <el-button class="btn" style="margin-top:48px" type="primary" @click="showLoginMedal = true">查看详情</el-button>
             </div>
+            <div v-if="activeName=='first' && year2023" class="medal-index">
+                <img style="width:162px;height:161px" :src="`${webBaseUrl}/images/medal/20230101.png`" alt="">
+                <p class="index-title">元旦勋章</p>
+                <!-- <p class="index-text">您已超过{{item.exceed}}人</p> -->
+            </div>
       </div>
       <div v-else class="home-no-list">
             <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset="">
@@ -82,6 +87,7 @@
   <script>
     import apiStat from '@/api/phase2/stat.js';
     import MedalImg from '@/components/Portal/medalImg.vue';
+    import apiYearMedal from '@/api/phase2/yearMedal.js';
     import { mapGetters } from 'vuex';
       export default{
           computed: {
@@ -135,9 +141,15 @@
                 tableData:[],
                 medalConfig:[],
                 rules:[],
+                year2023:false,
               }
           },
           mounted() {
+             apiYearMedal.has2023().then(rs=>{
+                if(rs.status==200 && rs.result){
+                  this.year2023=true;
+                }
+              });
              this.getMedal();
              this.getConfig();
           },