修复个人中心笔记中，公开笔记评论数取值错误

src/components/Course/courseForm.vue

@@ -141,7 +141,6 @@
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
-              <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
             </el-form-item>
             <el-form-item v-if="!weike.onlyRequired" label="课程来源">
               <el-radio-group v-model="courseInfo.source">
@@ -306,7 +305,6 @@
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
-                <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="课程来源">
@@ -490,8 +488,6 @@ export default {
         refType:''
       },
       visibleShow:false,
-      isPermission:false,
-      dicts:[],
       extendRefId:'',
       extendRefType:'',
       courseTeachers: [], //课程的老师
@@ -531,11 +527,7 @@ export default {
         dlgShow: false
       },
       rightTypeId: {},
-      catalogSortDialogShow: false,
+      catalogSortDialogShow: false
-      selectedOrg: {
-        orgId: null,
-        name: ''
-      }
     };
   },
   created() {
@@ -560,15 +552,9 @@ export default {
   },
   watch: {
     courseInfo: {
-      handler(newVal, oldVal) {
+      handler(newVal) {
-        // 需要保存
+        //需要保存
         this.requireSaveCourse = true;
-
-        console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        if (newVal.orgId !== oldVal.orgId) {
-          console.log("--- watch newVal.orgId = ", newVal.orgId);
-          this.checkOrgPermission(newVal.orgId);
-        }
       },
       deep: true
     }
@@ -595,22 +581,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    // 检查机构权限
-    checkOrgPermission(orgId) {
-      console.log("--- 监测组织id orgId  = ",orgId)
-      console.log("--- this.isPermission  = ",this.isPermission)
-      console.log("--- device  = ",this.courseInfo.device)
-      if (!orgId) {
-        this.isPermission = false;
-        return;
-      }
-      this.isPermission = this.dicts.includes(orgId);
-      this.courseInfo.device = 3;
-      if(this.isPermission){
-        this.courseInfo.device = 4;
-      }
-      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
-    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -919,8 +889,7 @@ export default {
     async getDetail(id) {
       this.curCourseId = id;
       this.orgName='';
-      this.isPermission = false;
+      let $this = this;
-        let $this = this;
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
@@ -937,10 +906,7 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
-          this.isPermission = result.isPermission; //课程的老师信息
+
-          this.dicts = result.dicts; //课程的老师信息
-          console.log("--- 编辑查看 this.isPermission  = ",this.isPermission)
-          console.log("--- 编辑查看 this.dicts  = ",this.dicts)
           if(!this.courseInfo.orgId){
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{

src/components/Course/homework.vue

@@ -109,7 +109,7 @@ export default {
          if(res.status==200){
              this.info=res.result;
              //检查是否过期
-            if(res.result.deadTime!='' && res.result.deadTime != null){
+            if(res.result.deadTime!=''){
                var d = new Date(res.result.deadTime);
                var now=new Date();
                if(now.getTime() > d.getTime()){

src/components/Portal/comments.vue

@@ -97,7 +97,7 @@
                            <a style="display: flex;align-items: center;" @click="showReply(com)">
                             <!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
                               <div class="is_comment"></div>
-                              <span>回复</span> 
+                              <span>回复</span>
                            </a>
                            <!--必须当前登录人是一个人-->
                            <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
@@ -558,7 +558,7 @@
                 this.$message.error(res.message);
             }
           });
-
+          this.loadData(false);
         }
 
       },
@@ -633,6 +633,7 @@
               this.$message.error(res.message);
            }
         });
+        this.loadData(false);
       },
       delCommnet(com,idx){
         if(com.replyList!='' && com.replyList.length>0){

src/components/VideoPlayer/index.vue

@@ -317,8 +317,8 @@ export default {
     }
 
     setInterval(() => {
-        // console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.readyState)
+          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
-        // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
+          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
           if(!this.isDrag){
             var time = localStorage.getItem('videoProgressData')
             var arr = time&&JSON.parse(time) || {}
@@ -364,11 +364,6 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
-      // console.log("当前缓存:"+this.videoDom.readyState)
-      if (this.videoDom.readyState < 1){
-        // console.log("详细信息",this.videoDom)
-        // console.log("卡了",this.videoDom.readyState)
-      }
       //if()
       //console.log(this.videoDom.readyState,'this.videoDom.readyState');
     }, 1000);

src/components/VideoPlayer/progress-bar.vue

@@ -86,9 +86,10 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
-        // 禁止拖动 true:禁止拖动，false:允许拖动
+        // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
+
         this.$emit("updateProgress", current);
       // }
 
@@ -102,7 +103,7 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
@@ -118,12 +119,12 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         this.$emit("getMouseDownStatus", false);
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
-        this.$emit("getMouseDownStatus", false);
+
       }
     },
   },

src/views/course/Mylecnotes.vue

@@ -9,7 +9,7 @@
         <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
       </div>
       <div style="padding: 0px 5px;">
-        <el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
+        <el-button icon="el-icon-refresh-right" @click="reset()" type="primary">重置</el-button>
       </div>
       <div style="padding: 0px 5px;">
         <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
@@ -25,8 +25,9 @@
       <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
     </div>
     <div style="margin-top:20px;">
-      <el-table :data="pageData" border stripe>
+      <el-table :data="pageData" border stripe style="width: 100%">
         <el-table-column
+          fixed
           label="序号"
           prop="index"
           width="100px">
@@ -252,6 +253,26 @@ export default {
         }
       })
     },
+    reset(){
+      let req = {
+        courseName: "",
+        pageNo: this.pageInfo.pageIndex,
+        pageSize: this.pageInfo.pageSize
+      }
+      apiCourse.getListByToken(req).then(res => {
+        if (res.status == 200) {
+          this.pageData = res.data.records;
+          this.pageInfo.pageSize = Number(res.data.size);
+          this.pageInfo.total = Number(res.data.total);
+          this.pageInfo.page = Number(res.data.current);
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.message
+          });
+        }
+      })
+    },
 
     // 每页显示的条数事件
     handleSizeChange(val) {

src/views/study/coursenew.vue

@@ -22,101 +22,91 @@
       <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
         <div class="course-player" ref="coursePlayer" id="id_course_player">
           <div>
-            <div v-if="false">
+            <div v-if="resType == null || resType == 0">
-              <div v-if="resType == null || resType == 0">
+              <!--先显示视频图片-->
-                <!--先显示视频图片-->
+              <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
-                <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
+            </div>
-              </div>
+            <div v-if="resType == 10" style="position: relative;">
-              <div v-if="resType == 10" style="position: relative;">
+              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
-                <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
+                :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
-                             :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
+                :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
-                             :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
+                @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
-                             @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
+              <div class="player-box" v-if="playerBoxShow">
-                <div class="player-box" v-if="playerBoxShow">
+                <div class="player-praise" style="cursor: pointer;">
-                  <div class="player-praise" style="cursor: pointer;">
+                  <div @click="praiseContent">
-                    <div @click="praiseContent">
+                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                      <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
-                      <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                    <!-- {{ courseInfo.praises }} -->
-                      <!-- {{ courseInfo.praises }} -->
+                    <div style="color:#fff;cursor: pointer;">赞</div>
-                      <div style="color:#fff;cursor: pointer;">赞</div>
-                    </div>
-                    <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
-                      <img class="icon-small" v-if="isTrample"
-                           :src="require('@/assets/images/icon/trample-active.png')" />
-                      <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
-                      <!-- {{ courseInfo.trampleCount }} -->
-                      <div style="color:#fff;cursor: pointer;">踩</div>
-                    </div>
                   </div>
-                  <div v-if="!scoreInfo.has" class="player-rate">
+                  <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                    <img class="icon-small" v-if="isTrample"
+                      :src="require('@/assets/images/icon/trample-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
+                    <!-- {{ courseInfo.trampleCount }} -->
+                    <div style="color:#fff;cursor: pointer;">踩</div>
+                  </div>
+                </div>
+                <div v-if="!scoreInfo.has" class="player-rate">
 
-                    <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
+                  <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
+                </div>
+                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                  <div class="player-rate" style="padding-left: 35px;">
+                    <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
                   </div>
-                  <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                  <span class="score-text" style="margin-top:35px">
-                    <div class="player-rate" style="padding-left: 35px;">
-                      <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
-                    </div>
-                    <span class="score-text" style="margin-top:35px">
                     <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
                     <span style="font-size: 12px;color: #fff">分</span>
                   </span>
 
-                  </div>
                 </div>
               </div>
-              <div v-if="resType == 20">
-                <div class="con-audio">
-                  <div class="con-audio-title">{{ contentData.contentName }}</div>
-                  <div class="con-audio-player">
-                    <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
-                                 @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
-                  </div>
-                </div>
-              </div>
-              <div v-if="resType == 40">
-                <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
-                  <div>此课程内容无法预览，请联系管理员</div>
-                </div>
-                <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
-                  此课程内容无法预览，请联系管理员
-                </div>
-                <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
-                </pdfPreview>
-              </div>
-              <div v-if="resType == 41">
-                <div style="padding: 20px;" v-html="contentData.content"></div>
-              </div>
-              <div v-if="resType == 50" style="min-height: 500px;">
-                <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
-              </div>
-              <div v-if="resType == 52">
-                <div v-if="contentData.content != ''">
-                  <div class="hyper-link" v-if="conLink.openType == 2">
-                    <div class="hyper-link-row">{{ contentData.contentName }}</div>
-                    <div class="hyper-link-row">{{ conLink.url }}</div>
-                  </div>
-                  <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
-                                                            style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
-                </div>
-              </div>
-              <div v-if="resType == 60">
-                <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
-              </div>
-              <div v-if="resType == 61">
-                <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
-              </div>
-              <div v-if="resType == 62" style="padding:5px">
-                <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
-                </assess>
-              </div>
             </div>
-            <div v-if="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
+            <div v-if="resType == 20">
-              <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
+              <div class="con-audio">
-                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
+                <div class="con-audio-title">{{ contentData.contentName }}</div>
+                <div class="con-audio-player">
+                  <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
+                    @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
+                </div>
               </div>
-              <div style="margin-top:20px;text-align:center" @click="getInternet" >
+            </div>
-                <el-button type="primary">重新检测</el-button>
+            <div v-if="resType == 40">
+              <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
+                <div>此课程内容无法预览，请联系管理员</div>
               </div>
+              <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
+                此课程内容无法预览，请联系管理员
+              </div>
+              <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
+              </pdfPreview>
+            </div>
+            <div v-if="resType == 41">
+              <div style="padding: 20px;" v-html="contentData.content"></div>
+            </div>
+            <div v-if="resType == 50" style="min-height: 500px;">
+              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
+            </div>
+            <div v-if="resType == 52">
+              <div v-if="contentData.content != ''">
+                <div class="hyper-link" v-if="conLink.openType == 2">
+                  <div class="hyper-link-row">{{ contentData.contentName }}</div>
+                  <div class="hyper-link-row">{{ conLink.url }}</div>
+                </div>
+                <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
+                    style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
+              </div>
+            </div>
+            <div v-if="resType == 60">
+              <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
+            </div>
+            <div v-if="resType == 61">
+              <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
+            </div>
+            <div v-if="resType == 62" style="padding:5px">
+              <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
+              </assess>
             </div>
           </div>
           <!--交互部分-->
@@ -295,7 +285,7 @@
                   <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
                 </div>
               </div>
-              <div class="teacher-info">
+              <div class="teacher-info" @click="toUserHome(item)" title="点击进入他的主页">
                 <div class="teacher-name">
                     <span> {{ item.teacherName }}</span>
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
@@ -313,17 +303,6 @@
         </div>
       </div>
     </div>
-    <el-dialog class="protocol" :close-on-click-modal="false" :visible="protocolDialogVisible" width="30%"
-               :show-close="false">
-      <div class="protocol-title">{{warnTitle}}</div>
-      <div class="protocol-content">
-        &emsp;&emsp;{{warn}}
-      </div>
-      <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="protocolDialogVisible = false">确
-                定</el-button>
-      </span>
-    </el-dialog>
     <!-- <div><portal-footer></portal-footer></div> -->
   </div>
 </template>
@@ -390,7 +369,6 @@
     },
     data() {
       return {
-        protocolDialogVisible: false,
         tentative: false,
         isContentTypeTwo: null,
         isContentType: null,
@@ -412,7 +390,6 @@
         curCFile: {
           converStatus: 4,
         },
-        Internet: 3,//1是成功 2是是失败 3是检测中
         radio: '',
         interactRuning: false,
         playerBoxShow: false,
@@ -477,8 +454,6 @@
         cumulativeDuration:0, //非音频累计时长
         maxDuration:0, //非音频最大时长
         defaultMaxTime:1800, //非音频默认最大时间
-        warn:"测试内容",
-        warnTitle:"测试标题",
       }
     },
     mounted() {
@@ -1382,8 +1357,7 @@
               }
             }
             this.courseInfo = rs.result.course;
-            this.warn = rs.result.warn;
+
-            this.warnTitle = rs.result.warnTitle;
             if (rs.result.teachers && rs.result.teachers.length > 0) {
               let userIds = [];
               let ctoUsers = [];
@@ -1412,52 +1386,12 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
-            if (rs.result.isPermission){
+
-            // if (true){
-              this.getInternet()
-              console.log('需要内网环境')
-            }
           } else {
             this.$message.error(rs.message);
           }
         });
       },
-      getXmlHttpRequest() {
-        if (window.XMLHttpRequest) {
-          return new XMLHttpRequest();
-        }
-        else if (window.ActiveXObject) {
-          return new ActiveXObject("Microsoft.XMLHTTP");
-        }
-      },
-      // 检测是否为内网
-      getInternet() {
-        this.Internet = 3;
-        let $this = this;
-        let xmlhttp = this.getXmlHttpRequest();
-        let timedOut = false;
-        let timer = setTimeout(function () {
-          timedOut = true;
-          xmlhttp.abort();
-        }, 5000);
-        xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
-        xmlhttp.send();
-        xmlhttp.onreadystatechange = function () {
-          if (xmlhttp.readyState == 4) {
-            if (xmlhttp.status == 200) {
-              clearTimeout(timer);
-              $this.Internet = 1;
-              $this.protocolDialogVisible=true
-            } else {
-              clearTimeout(timer);
-              $this.Internet = 2;
-            }
-          } else {
-            if (timedOut) return;//忽略中止请求
-            clearTimeout(timer);//取消等待的超时
-          }
-        }
-      },
       loadStudyData(result) {
         let $this=this;
         this.loadScorePraiseAndTrample();
@@ -1790,7 +1724,6 @@
       display: flex;
       justify-content: space-between;
       .course-player{ //内容播放区域
-        background-color: rgb(238, 238, 238);
         flex:1;
         min-width: 700px;
         min-height: 400px;
@@ -2435,18 +2368,4 @@
     height: 200px;
     background: url('../../../public/images/couresdetail.png');
   }
-
-.protocol {
-  .protocol-title {
-    font-size: 20px;
-    font-weight: 600;
-    text-align: center;
-    margin-bottom: 25px;
-  }
-
-  .protocol-content {
-    font-size: 14px;
-    line-height: 25px;
-  }
-}
 </style>

src/views/user/Mynotes.vue

@@ -88,9 +88,9 @@
                   <div>
                     <div class="textbut-box">
                       <div style="padding-top: 8px;">
-                        <interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true"  :type="6" :data="item"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                        <interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true"  :type="6" :data="item"  :shares="false" :comments="true" :answers="false" :clickAnswer="true" :views="false"></interactBar>
                       </div>
-                      <el-button @click="deleteNote(item)" style=" margin-right: 10px;" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
+                      <el-button @click="deleteNote(item)" style=" margin-right: 10px;margin-left: 15px" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
                       <el-button @click="edit(item)" class="textbut" type="text"><svg-icon icon-class="noteedit" ></svg-icon> 编辑</el-button>
                     </div>
                   </div>

src/views/user/Noteedit.vue

@@ -195,9 +195,7 @@ export default {
          if(num == 1) {
             this.editdata.isAuto = true;
          }
-         if(this.imgContent.length > 0) {
+         this.editdata.content = this.imgContent.join();
-            this.editdata.content = this.imgContent.join();
-         }
           apiNote.update(this.editdata).then(res=>{
             if(res.status == 200) {
               localStorage.removeItem(this.localStorageKey); //清空本地缓存

src/views/user/ranking.vue

@@ -23,7 +23,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <el-dropdown-item command="now">当前</el-dropdown-item>
+              <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -33,10 +33,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isNow ? '当前' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
+          {{isNow ? '当前年' : '累计'}}排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isNow ? '当前' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
+          {{isNow ? '当前年' : '累计'}}经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
         </div>
       </div>
 
@@ -117,7 +117,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <el-dropdown-item command="now">当前</el-dropdown-item>
+              <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -127,10 +127,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isStudyTime ? '当前' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
+          {{isStudyTime ? '当前年' : '累计'}}排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isStudyTime ? '当前' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
+          {{isStudyTime ? '当前年' : '累计'}}学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -206,7 +206,7 @@
                     </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="total">累计</el-dropdown-item>
-              <!-- <el-dropdown-item command="now">当前</el-dropdown-item> -->
+               <el-dropdown-item command="now">当前年</el-dropdown-item>
               <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
               <el-dropdown-item command="months">本月</el-dropdown-item>
               <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -216,10 +216,10 @@
       </div>
       <div class="myselftext">
         <div class="myranking">
-          {{isStudyDay ? '当前' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
+          {{isStudyDay ? '当前年' : '累计'}}排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          {{isStudyDay ? '当前' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
+          {{isStudyDay ? '当前年' : '累计'}}学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
         </div>
       </div>
       <div class="exp-table" style="margin-top:20px;">
@@ -311,7 +311,7 @@ export default {
       formatSecondToHour:formatSecondToHour,
       experience:{
         field:'now',
-        name:'当前',
+        name:'当前年',
         data:{
           rankingNo:0,
           total:0
@@ -320,7 +320,7 @@ export default {
       },
       learningDuration:{
         field:'now',
-        name:'当前',
+        name:'当前年',
         data:{
           rankingNo:0,
           total:0