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

src/api/phase2/note.js

@@ -61,12 +61,6 @@ const history=function (noteId){
   return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/modify/history?noteId='+noteId);
 }
 
-/**
- * 分页查询我发布的，收藏的，点赞的笔记  弃用
- * */
-const pagelist=function (query){
-  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/pagelist',query);
-}
 
 /**
  * 我的笔记
@@ -123,6 +117,21 @@ const exportPdf=function (data){
   return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/exportPdf',data);
 }
 
+/**
+ * 我的笔记收藏和分享都是这一个，目前只有收藏
+ * @param{
+ *    paegIndex
+ *    pageSize
+ *    dataType 1收藏 2分享
+ *    orderType 排序顺序 顺序倒叙
+ *    orderField 排序字段
+ *    keyword 关键字查询
+ * }
+ * */
+const pagelist=function (query){
+  return ajax.post('/xboe/subgroup/m/noteinfo/pagelist',query);
+}
+
 export default {
   save,
   detail,

src/assets/styles/portal.scss

@@ -10,7 +10,7 @@ body {
 .xcontent{
     // width: 1000px;
     // margin: 0px auto;
-    // margin: 0px 5%;
+    margin: 0px 5%;
 }
 .index-course{
   // width: 25%;

src/assets/styles/uc.scss

@@ -1,3 +1,64 @@
 /**
  * 用户中心的一些通用样式，定义在这里面
  */
+ .uc-center-page{
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    line-height: 36px;
+    margin-right: 44px;
+ }
+ .uc-center-one-title{
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+ }
+ .uc-center-title{
+    font-size: 16px;
+    font-weight: 600;
+    color: #333333;
+ }
+ .uc-center-time{
+    font-size: 14px;
+    color: #666666;
+ }
+ .uc-center-icon{
+    font-size: 12px;
+    color: #999999;
+ }
+ .el-message-box{
+    width: 502px;
+    height: 282px;
+ }
+ .el-message-box__header{
+    display: none;
+ }
+ .el-message-box__content{
+    text-align: center;
+    margin-top: 86px;
+    padding: 0;
+    font-weight: 600;
+    color: #333333;
+    font-size: 22px;
+    .el-message-box__status{
+        display: none;
+    }
+ }
+ .el-message-box__btns{
+    margin-top: 60px;
+    text-align: center;
+    .el-button{
+        width: 140px;
+        height: 40px;
+        border-radius: 4px;
+        border: 1px solid #387DF7;
+
+    }
+   
+ }
+ .el-message-box__btns button:nth-child(1) {
+    color: #387DF7;
+}
+ .el-message-box__btns button:nth-child(2) {
+    margin-left:20px;
+}

src/components/NoteUpload/index.vue

@@ -24,6 +24,7 @@
         </div>
       </el-upload> -->
       <el-upload
+      ref="myUpload"
         class="upload-demo"
         drag
         :multiple="limit>1"
@@ -43,7 +44,7 @@
     </el-upload>
   
       <!-- 文件列表 -->
-      <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
         <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in list">
           <el-link :href="file.url" :underline="false" target="_blank">
             <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
@@ -52,7 +53,7 @@
             <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
           </div>
         </li>
-      </transition-group>
+      </transition-group> -->
     </div>
   </template>
   
@@ -105,6 +106,10 @@
         type: Boolean,
         default: false
       },
+      isClear:{
+        type: Boolean,
+        default: false
+      }
     },
     data() {
       return {
@@ -119,6 +124,13 @@
         }
       };
     },
+    watch: {
+      isClear(val) {
+        if(!val) {
+           this.clearFiles();
+        }
+      }
+    },
     computed: {
       // 是否显示提示
       showTip() {
@@ -145,8 +157,10 @@
       },
     },
     methods: {
+      clearFiles() {
+        this.$refs["myUpload"].clearFiles();
+      },
         handleUploadRemove(file) {
-            console.log(file,'file');
             this.$emit("remove",file);
         },
       // 上传前校检格式和大小
@@ -220,7 +234,6 @@
       }
     },
     created() {
-     
       this.fileList = this.list;
     },
   };

src/components/Portal/noteComment.vue

@@ -28,7 +28,7 @@
                         </div>
                         <div class="comment-time portal-time">
                           <showTime :time="com.sysCreateTime"></showTime>
-                          <interactBar :type="10" :shares="false"  :data="com" @addAnswers="showReply(com)" :favorites="false" :views="false" :comments="false" :answers="true"></interactBar>
+                          <interactBar :type="10" :shares="false"  :data="com" @addAnswers="showReply(com)" :views="false" :comments="false" :answers="true"></interactBar>
                         </div>
                         <div v-if="replyInfo.parentId==com.id" class="comment-reply" style="padding-bottom: 5px;">
                           <div style="width:100%;display:flex;">
@@ -63,7 +63,7 @@
                                       </div>
                                       <div class="comment-time portal-time">
                                        <showTime :time="reply.sysCreateTime"></showTime>
-                                       <interactBar :type="10" :shares="false"  :data="reply" @addAnswers="showReply(reply)" :favorites="false" :views="false"  :comments="false" :answers="true"></interactBar>
+                                       <interactBar :type="10" :shares="false"  :data="reply" @addAnswers="showReply(reply)" :views="false"  :comments="false" :answers="true"></interactBar>
                                       </div>
                                   </div>
                                   <!--发布回复-->
@@ -176,6 +176,10 @@
         readonly:{
           type:Boolean,
           default:false
+        },
+        name:{
+          type:String,
+          default:''
         }
         },
       components:{showTime,authorInfo,interactBar},
@@ -324,6 +328,7 @@
                 let ids=[];
                 let allList=[];
                 res.result.list.forEach(item=>{
+                  item.title = this.name;
                   item.replyList = [];
                   item.avatar='';
                   item.orgInfo='';
@@ -334,6 +339,7 @@
                   ids.push(item.sysCreateAid);
                   if(item.replyList && item.replyList!=''){
                       item.replyList.forEach(reply=>{
+                        reply.title=this.name;
                         reply.avatar='';
                         reply.orgInfo='';
                         reply.name='';
@@ -412,6 +418,7 @@
               if(res.status==200){
                   // this.list.unshift(res.result);
                   // this.sex =
+                  res.result.title = this.name;
                   res.result.sex=null;
                   res.result.isAll=false;
                   this.list.unshift(res.result);

src/components/PortalFloatTools.vue

@@ -6,32 +6,32 @@
       <div class="float-tool-icon" @click="toNeedCourse" v-if="identity>1">
         <!-- <svg-icon class-name="icon"  icon-class="lessons"></svg-icon> -->
           <div class="float-img"><img :src="`${webBaseUrl}/images/explo.png`" alt=""></div>
-        <span>做课程</span>
+        <!-- <span>做课程</span> -->
       </div>
       <div class="float-tool-icon" @click="$refs.addQuestion.askQuestionDialog = true">
         <!-- <svg-icon class-name="icon"  icon-class="problem"></svg-icon> -->
          <div class="float-img"><img :src="`${webBaseUrl}/images/issue.png`" alt=""></div>
-        <span>提问题</span>
+        <!-- <span>提问题</span> -->
       </div>
       <div class="float-tool-icon" @click="toAddArticle()">
         <!-- <svg-icon class-name="icon"  icon-class="essay"></svg-icon> -->
        <div class="float-img">  <img :src="`${webBaseUrl}/images/essay.png`" alt=""></div>
-        <span>写文章</span>
+        <!-- <span>写文章</span> -->
       </div>
       <div class="float-tool-icon" @click="showFeedback()">
         <!-- <svg-icon class-name="icon"  icon-class="agree"></svg-icon> -->
        <div class="float-img">  <img :src="`${webBaseUrl}/images/opinion.png`" alt=""></div>
-        <span>提意见</span>
+        <!-- <span>提意见</span> -->
       </div>
       <div class="float-tool-icon" @click="infoShow=true">
         <!-- <svg-icon class-name="icon"  icon-class="server"></svg-icon> -->
         <div class="float-img"> <img :src="`${webBaseUrl}/images/contact.png`" alt=""></div>
-        <span>联系我们</span>
+        <!-- <span>联系我们</span> -->
       </div>
       <div class="float-tool-icon" @click="backtop">
         <!-- <svg-icon class-name="icon"  icon-class="top"></svg-icon> -->
        <div class="float-img"> <img :src="`${webBaseUrl}/images/back.png`" alt=""></div>
-        <span>返回顶部</span>
+        <!-- <span>返回顶部</span> -->
       </div>
     </div>
     <!-- <div class="float-tools">
@@ -250,7 +250,7 @@ export default {
     .float-tool-icon{
       cursor: pointer;
       padding: 8px 0;
-      border-bottom: 1px solid #999;
+      // border-bottom: 1px solid #999;
       display: flex;
       flex-direction: column;
       align-items: center;
@@ -264,8 +264,8 @@ export default {
           padding-top: 5px;
         }
       .float-img{
-         width: 20px;
+         width: 16px;
-         height: 20px;
+         height: 16px;
 
          img{
            width: 100%;

src/components/PortalHeader.vue

@@ -65,7 +65,7 @@
             <div class="person-action-item">
               <el-badge class="person-action-index message-count"  :value="userMsg" :hidden="userMsg == 0">
                 <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
-                   <el-link  type="primary" :href="`${webBaseUrl}/message`" :underline="false">
+                   <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
                     <svg-icon v-if="current == 'qa'"  style="margin-right: 0;font-size:26px;" icon-class="message"></svg-icon>
                     <svg-icon v-else style="margin-right: 0;font-size:26px;" icon-class="messfff"></svg-icon>
                    </el-link>

src/layout/components/AppMain.vue

@@ -6,7 +6,7 @@
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" style="padding: 0px 10px;flex:1; background-color: #fff;margin-left: 32px;padding-top:20px">
+      <div class="main-body" style="padding: 30px 30px;flex:1; background-color: #fff;margin-left: 32px;">
         <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
           <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>

src/layout/components/TopNav/Index.vue

@@ -41,7 +41,7 @@
           <!-- </div> -->
           <div>
             <el-badge :value="userMsg" :hidden="userMsg==0" class="message-count">
-              <el-link type="primary" :href="`${webBaseUrl}/message`" target="_blank" :underline="false">
+              <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" target="_blank" :underline="false">
                 <svg-icon style="margin-right: 0;font-size:26px;" icon-class="messfff"></svg-icon>
               </el-link>
             </el-badge>

src/views/exam/MyExamTask.vue

@@ -1,8 +1,9 @@
 <template>
   <!--我的独立考试-->
   <div>
-      <div style="display: flex; justify-content: flex-start;padding:12px 20px 10px 22px" >
+      <div style="display: flex; justify-content: flex-start;padding:12px 20px 20px 22px" >
         <!--查询-->
+        <div class="uc-center-page">我的考试</div>
         <div style="padding: 0px 0px">
           <el-select clearable v-model="status" placeholder="状态" style="width: 110px">
             <el-option label="未开始" :value="0"></el-option>
@@ -11,17 +12,16 @@
             <el-option label="完成" :value="9"></el-option>
           </el-select>
         </div>
-        <div style="padding-left: 10px">
+        <div style="padding-left: 16px">
           <el-input v-model="testName"  clearable placeholder="搜索名称"></el-input>
         </div>
-        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
+        <div class="button-class" style="padding-left: 14px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
-        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right"  @click="reset()">重置</el-button></div>
+        <div class="button-class" style="padding-left: 14px"><el-button type="primary" icon="el-icon-refresh-right"  @click="reset()">重置</el-button></div>
 
       </div>
       <div>
 
         <div v-for="(item,idx) in taskList" :key="idx" class="titem">
-            <!-- <div><a :href="webBaseUrl+'/exam/test?id='+item.objId" target="_blank"> {{item.objId}}</a></div> -->
             <div class="task-info">
                <div @click="jumpRouter(item)" v-html="$keywordActiveShow(item.testName,testName)" class="task-tit one-line-ellipsis">
                </div>
@@ -46,10 +46,6 @@
              <a v-if="item.status == 1 && 8" :href="webBaseUrl+'/exam/test?id='+item.testId" target="_blank" >
                <el-button  type="primary" size="small">继续考试</el-button>
             </a>
-             <!-- <a v-if="item.status == 9" :href="webBaseUrl+'/exam/test?id='+item.testId" target="_blank" >
-               <el-button  type="primary" size="small">回顾考试</el-button>
-            </a> -->
-            
                <el-button   type="primary" v-if="item.status == 9"  size="small" @click="jumpRouter(item)">查看</el-button>
           </div>
         </div>
@@ -65,11 +61,13 @@
               :total="total">
             </el-pagination>
           </div>
-          <div v-else>
+          <div v-else class="home-no-list">
-            <div v-if="taskList.length == 0">
+            <img class="img" src="/images/homeWu/no-case.png" alt="" srcset="">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+            <p class="text">还没有案例</p>
-              <div v-else class="zan-wu">暂无数据</div>
+            <!-- <div v-if="taskList.length == 0"> -->
-              </div>
+              <!-- <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+              <div v-else class="zan-wu">暂无数据</div> -->
+              <!-- </div> -->
             </div>
           </div>
        
@@ -166,7 +164,7 @@
       font-size: 18px;
       color: #333;
       margin-top: -3px;
-      font-weight: 700;
+      font-weight: 600;
       }
       .task-text{
      color: #444;

src/views/study/coursenew.vue

@@ -114,7 +114,7 @@
                    <comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="1" :obj-id="courseInfo.id" :toUsers="toUsers"></comments>
                 </div>
                 <div v-show="!courestab" class="coures-note">
-                  <note-comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id"></note-comments>
+                  <note-comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id" :name="courseInfo.name"></note-comments>
                 </div>
             </div>
            </div>

src/views/user/Mynotes.vue

@@ -122,7 +122,7 @@
             </div>
             <div class="import-info-enclosure">
                 <label class="label" style="width:66px"><svg-icon style="font-size:16px;margin-right:5px" icon-class="enclisure"></svg-icon>附件</label>
-                    <file-upload dir="files" :fileType="upNoteFile.fileType" :showList="true" :value="imageShowUrl" :limit="upNoteFile.limit" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
+                    <file-upload dir="files" ref="myUpload" :isClear="importDialogVisible" :fileType="upNoteFile.fileType" :showList="true" :value="imageShowUrl" :limit="upNoteFile.limit" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
                 </div>
         </div>
         <span slot="footer" class="dialog-footer">
@@ -138,10 +138,10 @@
         <div class="Exportbox">
             <div class="export-dialog-top">
                 <div class="export-dialog-left">
-                    <author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
+                    <author-img :avatar="userData.avatar" :aid="userData.aid" :sex="userData.sex"></author-img>
                     <div class="userInfo-info">
-                        <p><span style="font-weight: 500;font-size: 22px;">{{userInfo.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
+                        <p><span style="font-weight: 500;font-size: 22px;">{{userData.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
-                        <p>{{userInfo.sign}}</p>
+                        <p>{{userData.sign}}</p>
                     </div>
                 </div>
                 <div class="export-dialog-right">
@@ -184,7 +184,8 @@ import interactBar from '@/components/Portal/interactBar.vue';
 import FileUpload from '@/components/NoteUpload/index.vue';
 import AuthorImg from '@/components/Portal/authorImg.vue';
 import { mapGetters } from 'vuex';
-import {formatDate} from '@/utils/tools.js'
+import {formatDate} from '@/utils/tools.js';
+import apiUser from "@/api/system/user.js";
 export default {
     components:{interactBar,FileUpload,AuthorImg},
     computed: {
@@ -192,6 +193,7 @@ export default {
   },
   data(){
       return{
+        userData:{},
         formatDate,
         noteFile:{
             contentType:null,
@@ -245,6 +247,13 @@ export default {
   mounted(){
     this.noteData(null);
     this.allcoures();
+    apiUser.getByIds([this.userInfo.aid]).then(res => {
+        if (res.status == 200) {
+           this.userData = res.result[0];
+        } else {
+          this.$message.error(res.message);
+        }
+    });
   },
   methods: {
     exportCommand(e) {
@@ -258,10 +267,10 @@ export default {
             }
         })
         let data = {
-            name:this.userInfo.name,
+            name:this.userData.name,
-            sign:'abcd',
+            sign:this.userData.sign,
             ids:ids,
-            author:this.userInfo.avatar,//this.userInfo.avatar,
+            author:this.userData.avatar,//this.userInfo.avatar,
         }
         if(this.exportType == '1') {
             apiNote.exportPdf(data).then(res=>{
@@ -410,7 +419,7 @@ export default {
       publish(){
          this.ordertime = !this.ordertime;
           this.orderType = !this.orderType;
-          this.orderField = 'sysCreateTime';
+          this.orderField = 'sysUpdateTime';
           this.noteData(this.num)
       },
       thumbs(){

src/views/user/Setting.vue

@@ -443,12 +443,13 @@
   .personSetting{
     background-color: #fff;
     box-sizing: border-box;
-    padding: 30px 0px 0px 247px;
+    // padding: 30px 0px 0px 247px;
+    padding: 30px 0 10% 20%;
     // margin: 0 auto;
     position: relative;
     .avatar{
       position: absolute;
-      left: 86px;
+      left: 5%;
       top:56px;
     }
     .passWard-btn{
@@ -469,6 +470,8 @@
       box-shadow: -1px 0 0 0 #387DF7;
     }
     .informationItem{
+      min-width: 600px;
+      padding-right: 10%;
       margin-bottom: 82px;
       .information-header{
         // display: flex;

src/views/user/ranking.vue

@@ -9,7 +9,7 @@
              </div>
               <div class="exp-hear-xiala">
                  <el-dropdown trigger="click"  @command="experienceCommand">
-                    <span class="el-dropdown-link">
+                    <span class="el-dropdown-link pointer">
                         {{experience.name}}<i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <el-dropdown-menu slot="dropdown">
@@ -97,7 +97,7 @@
              </div>
               <div class="exp-hear-xiala">
                  <el-dropdown trigger="click" @command="durationCommand">
-                    <span class="el-dropdown-link">
+                    <span class="el-dropdown-link pointer">
                         {{learningDuration.name}}<i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <el-dropdown-menu slot="dropdown">
@@ -170,7 +170,7 @@
              </div>
               <div class="exp-hear-xiala">
                  <el-dropdown trigger="click" @command="daysCommand">
-                    <span class="el-dropdown-link">
+                    <span class="el-dropdown-link pointer">
                         {{learningDays.name}}<i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <el-dropdown-menu slot="dropdown">