diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue
index 97ac0b65..63b29a27 100644
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -202,6 +202,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
      }
      .learning-an{
           color: #999999;
+          text-align: center;
           font-size: 14px;
           span{
             font-weight: 600;
diff --git a/src/icons/svg/notedel.svg b/src/icons/svg/notedel.svg
new file mode 100644
index 00000000..e88a2765
--- /dev/null
+++ b/src/icons/svg/notedel.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 17备份 2</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.个人中心-我的笔记" transform="translate(-1648.000000, -766.000000)">
+            <g id="编组-17备份-2" transform="translate(1648.000000, 766.000000)">
+                <path d="M6.02941176,0 L7.26470588,0 C8.09313301,-1.52179594e-16 8.76470588,0.671572875 8.76470588,1.5 L8.76470588,2 L8.76470588,2 L4.52941176,2 L4.52941176,1.5 C4.52941176,0.671572875 5.20098464,1.52179594e-16 6.02941176,0 Z" id="矩形" fill="#B3BDC4"></path>
+                <rect id="矩形" fill="#B3BDC4" x="1.70588235" y="3.33333333" width="10.5882353" height="10.6666667" rx="1"></rect>
+                <rect id="矩形" stroke="#B3BDC4" fill="#B3BDC4" x="1.5" y="1.83333333" width="11" height="1" rx="0.5"></rect>
+                <line x1="7" y1="5.45305864" x2="7" y2="11.7528444" id="路径-8" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="4.17647059" y1="6.78639197" x2="4.17647059" y2="10.3333333" id="路径-8备份" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="9.82352941" y1="6.78639197" x2="9.82352941" y2="10.3333333" id="路径-8备份-2" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/noteedit.svg b/src/icons/svg/noteedit.svg
new file mode 100644
index 00000000..7f795d0d
--- /dev/null
+++ b/src/icons/svg/noteedit.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 29备份</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.个人中心-我的笔记" transform="translate(-1730.000000, -765.000000)">
+            <g id="编组-29备份" transform="translate(1729.924710, 765.680000)">
+                <polygon id="路径-43" fill="#B3BDC4" points="0 13.9410809 0 10.6558397 7.27139923 2.94108088 10 5.30290022 3.1717043 13.4556476"></polygon>
+                <polygon id="路径-44" fill="#B3BDC4" points="7.65603638 1.92850202 9.38504183 0.0454018553 13.1720469 2.94108088 11.116001 4.75994664"></polygon>
+                <line x1="5.72584098" y1="13.2381356" x2="13.1720469" y2="13.2381356" id="路径-45" stroke="#B3BDC4" stroke-width="2"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index 96f16097..7098c434 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -4,22 +4,50 @@
             <h3>我的笔记</h3>
             <div>
                 <el-button>导入</el-button>
-                <el-button @click="dialogVisible = true">导出</el-button>
+                <!-- <el-button @click="dialogVisible = true">导出</el-button> -->
+                <el-select   @click="dialogVisible = true" style="width:160px;height:40px;margin-left:20px;" v-model="courseId" placeholder="导出">
+               <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
             </div>
         </div>
         <div class="note-sift">
                  <el-date-picker
+                 @change="Time()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                  class="el-buttons"
-                v-model="value1"
+                v-model="Filtertime"
                 type="daterange"
                 start-placeholder="开始"
                 end-placeholder="结束"
                >
                 </el-date-picker>
-                <!-- <i class="el-icon-arrow-down"></i> -->
-            <el-button class="el-buttons el-dropdown-link">全部课程 <i class="el-icon-arrow-down"></i></el-button>
-            <el-button class="el-buttons">发布时间 <i class="el-icon-bottom"></i></el-button>
-            <el-button class="el-buttons">点赞次数 <i class="el-icon-bottom"></i></el-button>
+               
+            <el-select @change="noteData(num)"  style="width:160px;height:40px;margin-left:20px;" v-model="courseId" placeholder="全部课程">
+                <el-option
+                v-for="(item,idx) in couresna"
+                :key="idx"
+                :label="item.courseName"
+                :value="item.courseId">
+                </el-option>
+            </el-select>
+
+
+
+            <el-button @click="publish" class="el-buttons">
+                发布时间 
+                <i  v-if="ordertime" class="el-icon-bottom"></i>
+                <i v-else class="el-icon-upload2"></i>
+                </el-button>
+            <el-button @click="thumbs" class="el-buttons">
+                点赞次数 
+                 <i v-if="orderpiss" class="el-icon-bottom"></i>
+                 <i v-else class="el-icon-upload2"></i>
+                </el-button>
         </div>
         <div class="note-tab">
             <div class="tabcontent">
@@ -38,12 +66,16 @@
               </div>
               <div class="all-content">
                  {{ item.content }}
+                  <img v-if="item.filePath" :src="fileBaseUrl + item.filePath" alt="">
               </div>
               <div class="all-footer">
                   <div>
                   <div class="textbut-box">
-                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="datalist"  :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
-                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button @click="edit" class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  <interactBar nodeWidth="60px" :readonly="true"  :type="6" :data="datalist"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                    <el-button @click="open(item)" style=" margin-right: 10px;" 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>
               </div>
@@ -62,8 +94,11 @@
               <div class="all-footer">
                   <div>
                   <div class="textbut-box">
-                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="datalist"  :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
-                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button @click="edit" class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  <interactBar nodeWidth="60px" :readonly="true"  :type="6" :data="datalist"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                    <el-button @click="open(item)" style=" margin-right: 10px;" 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>
               </div>
@@ -78,14 +113,16 @@
               </div>
               <div class="all-content">
                  <img src="../../../public/images/course.png" alt="">
-                 <img src="" alt="">
-                 <img src="" alt="">
+                 <!-- <img v-if="item.filePath" :src="fileBaseUrl + item.filePath" alt=""> -->
               </div>
               <div class="all-footer">
                   <div>
-                  <div class="textbut-box">
-                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
-                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button @click="edit" class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                 <div class="textbut-box">
+                  <interactBar nodeWidth="60px" :readonly="true"  :type="6" :data="datalist"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                    <el-button @click="open(item)" style=" margin-right: 10px;" 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>
               </div>
@@ -104,12 +141,16 @@
               </div>
               <div class="all-content">
                  {{ item.content }}
+                 <img v-if="item.filePath" :src="fileBaseUrl + item.filePath" alt="">
               </div>
               <div class="all-footer">
                   <div>
                   <div class="textbut-box">
-                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="datalist"  :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
-                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button @click="edit" class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  <interactBar nodeWidth="60px" :readonly="true"  :type="6" :data="datalist"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                    <el-button @click="open(item)" style=" margin-right: 10px;" 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>
               </div>
@@ -127,12 +168,16 @@
               </div>
               <div class="all-content">
                  {{ item.content }}
+                 <img v-if="item.filePath" :src="fileBaseUrl + item.filePath" alt="">
               </div>
               <div class="all-footer">
                   <div>
                   <div class="textbut-box">
-                  <!-- <interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="datalist" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar> -->
-                    <el-button style=" margin-right: 10px;" class="textbut" type="text"> <i class="el-icon-delete"></i> 删除</el-button><el-button @click="edit" class="textbut" type="text"> <i class="el-icon-edit"></i> 编辑</el-button>
+                  <interactBar nodeWidth="60px" :readonly="true"  :type="6" :data="datalist"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                    <el-button @click="open(item)" style=" margin-right: 10px;" 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>
               </div>
@@ -190,43 +235,111 @@
 </template>
 
 <script>
-import apiNote from '@/api/phase2/note.js'
+import apiNote from '@/api/phase2/note.js';
 import interactBar from '@/components/Portal/interactBar.vue';
 export default {
     components:{interactBar},
   data(){
       return{
+          fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+           options: [{
+          value: '选项1',
+          label: 'PDF'
+        }, {
+          value: '选项2',
+          label: 'Excel'
+        }],
            value1: '起止时间',
            num :null,
            dialogVisible: false,
            pageIndex:1,
            paegSize:1,
-           orderType:'',
-           orderField:'praises',
+           orderType:true,
+           orderField:'',
            courseId:'',
-           endTime:'',
+           startTime:'',
            endTime:'',
            datalist:[ ],
+           thu:true,
+           couresna:[],
+           courseName:'',
+           ordertime:true,
+           orderpiss:true,
+           Filtertime:[],
       }
       
 
   },
   mounted(){
-    this.noteData(null)
+    this.noteData(null);
+    this.allcoures();
   },
   methods: {
+      Time(){
+        this.startTime = this.Filtertime[0];
+        this.endTime =  this.Filtertime[1];
+        console.log(this.Filtertime[0]);
+        this.noteData(this.num);
+      },
+       open(item) {
+            this.$confirm('移除后将不在笔记列表中展示', '确定要删除您的笔记吗？', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+             apiNote.del(item.id).then(res=>{
+                this.noteData(this.num);
+                this.$message({
+                    type: 'success',
+                    message: '删除成功!'
+                });
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+           console.log(item.id)
+          
+       
+      },
+      couresitem(item){
+        console.log(item.courseId)
+        this.courseId = item.courseId;
+        this.noteData(this.num)
+      },
+     
+      allcoures(){
+        apiNote.course().then(res=>{
+            this.couresna = res.result
+        })
+      },
+      publish(){
+         this.ordertime = !this.ordertime;
+          this.orderType = !this.orderType;
+          this.noteData(this.num)
+      },
+      thumbs(){
+        this.orderpiss = !this.orderpiss;
+         this.orderField = 'praises';
+         this.orderType = !this.orderType;
+         this.noteData(this.num)
+      },
       handleClose(done) {
         
 
          
       },
-      edit(){
-      this.$router.push({ path: '/user/Noteedit' });
+      edit(item){
+      this.$router.push({ path: `/user/Noteedit?id=${item.id}` });
 
 
       },
       noteData(tab){
-          console.log(tab)
+        //   console.log(tab)
         this.num = tab
         let data = {
             pageIndex:this.pageIndex,
@@ -235,14 +348,14 @@ export default {
             orderField:this.orderField,
             courseId:this.courseId,
             type:this.num,
-            startTime:this.endTime,
-            endTime:this.endTime
+            startTime:this.startTime,
+            endTime:this.endTime,
         }
         apiNote.query(data).then(res=>{
-            console.log(res);
+            // console.log(res);
            
           this.datalist = res.result.list 
-           console.log(this.datalist,'111lmj')
+        //    console.log(this.datalist,'111lmj')
         })
       },
 
@@ -251,7 +364,7 @@ export default {
   const hour = parseInt(time / 3600) < 10 ? '0' + parseInt(time / 3600) : parseInt(time / 3600)
   const min = parseInt(time % 3600 / 60) < 10 ? '0' + parseInt(time % 3600 / 60) : parseInt(time % 3600 / 60)
   const sec = parseInt(time % 3600 % 60) < 10 ? '0' + parseInt(time % 3600 % 60) : parseInt(time % 3600 % 60)
-  console.log(hour + ':' + min + ':' + sec)
+//   console.log(hour + ':' + min + ':' + sec)
   return hour + ':' + min + ':' + sec
 }
 
@@ -260,6 +373,30 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-select-dropdown__item{
+    width: 140px !important;
+}
+.el-input--medium .el-input__inner{
+    height: 40px;
+    line-height: 40px;
+}
+.el-dropdown-menu--medium .el-dropdown-menu__item{
+    width: 140px !important;
+    height: 30px !important;
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+  display: block;
+  word-break:break-all;
+}
+.el-dropdown-menu--medium{
+    padding: 12px  10px;
+    overflow: hidden;
+}
+.el-popper{
+    margin-top: 5px;
+}
+
 .Export-info:last-child{
     border: none;
 }
@@ -368,7 +505,7 @@ export default {
 .tabcontent{
     span{
          margin-right: 45px;
-        padding: 0 6px;
+        padding: 0 7px;
         text-align: center;
         padding-bottom: 14px;
         display: inline-block;
@@ -376,8 +513,9 @@ export default {
 }
 
 .tab-textactive{
-    border-bottom: 3px solid #3379FB;
+    border-bottom: 4px solid #3379FB;
     transform: all 0.3s;
+    font-weight: 600;
 }
 .note-tab{
     height: 40px;
diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue
index 15c83547..dd6cfcb2 100644
--- a/src/views/user/Noteedit.vue
+++ b/src/views/user/Noteedit.vue
@@ -7,63 +7,40 @@
          </div>
          <div class="edit-content">
             <div class="note-tit">
-                <h3> 《高效能人士的7个习惯》</h3>
+                <h3> {{ editdata.courseName }} </h3>
                 <div><img src="../../../public/images/coteplay.png" alt="">8:40</div>
             </div>
             <div class="note-text">
-                我见过的策划们，不管是甲方企业的，还是广告代理，还营销策划公司的，在做策略写方案的时候，在写策略方做策略写方案的的时案的的时案<br>
-                1）套理论<br>
-                找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要 照着这个理论的
-                 我见过的策划们，不管是甲方企业的，还是广告代理，还营销策划公司的，在做策略写方案的时候，在写策略方做策略写方案的的时案的的时案<br>
-                2）套理论<br>
-                找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要 照着这个理论的
-                 我见过的策划们，不管是甲方企业的，还是广告代理，还营销策划公司的，在做策略写方案的时候，在写策略方做策略写方案的的时案的的时案<br>
-                3）套理论<br>
-                找一个营销理论，做策略时直接向上套。不管是什么行业、企业处在什么发展阶段，都要 照着这个理论的
+               <!-- <input style="vertical-align:top;outline:none;" type="textarea"  :rows="4" v-model="editdata.content"> -->
+                <textarea v-model="editdata.content" name="" id="" cols="" rows="16" style="vertical-align:top;outline:none;width:100%;border:none; font-size: 14px;font-weight: 400;color: #333333;"></textarea>
             </div>
          </div>
          <div class="edit-footer">
-            <el-radio v-model="radio" label="1">公开</el-radio>
-           <el-radio v-model="radio" label="2">私密</el-radio>
+            <el-radio v-model="editdata.openType" label="9">公开</el-radio>
+           <el-radio v-model="editdata.openType" label="1">私密</el-radio>
             <el-button plain>取消</el-button>
-            <el-button type="primary">确定</el-button>
+            <el-button type="primary" @click="savedata" >确定</el-button>
          </div>
       </div>
 
 
       <div class="edti-hist">
          <h3>历史记录</h3>
-         <div class="histinfo">
+         <div class="histinfo" v-for="(item,idx) in histdata" :key="idx">
             <div class="hist-top">
                编辑了笔记
                <span>2022/4/5  22:42:32</span>
             </div>
             <div class="hist-cont">
                <div class="hist-tit">
-                  3）套方案
-                  <span> <i class="el-icon-refresh-left"></i> 还原</span>
+                  <div class=".two-line-ellipsis">
+                      {{ item.noteName }}
+                  </div>
+                 
+                  <span @click="restore(item)"> <i class="el-icon-refresh-left"></i> 还原</span>
                </div>
                <div class="hist-text">
-                  最后一个做策划的方案就是套方案，这一点尤其是策划小白其是策
-们经常会犯，自己不会写方案，一写方案就照
-               </div>
-            </div>
-         </div>
-
-
-           <div class="histinfo">
-            <div class="hist-top">
-               编辑了笔记
-               <span>2022/4/5  22:42:32</span>
-            </div>
-            <div class="hist-cont">
-               <div class="hist-tit">
-                  3）套方案
-                  <span> <i class="el-icon-refresh-left"></i> 还原</span>
-               </div>
-               <div class="hist-text">
-                  最后一个做策划的方案就是套方案，这一点尤其是策划小白其是策
-们经常会犯，自己不会写方案，一写方案就照
+                 {{ item.beforeContent }}
                </div>
             </div>
          </div>
@@ -74,16 +51,63 @@
 </template>
 
 <script>
+import apiNote from '@/api/phase2/note.js'
 export default {
    data () {
       return {
-        radio: '1'
+        radio: '1',
+        editdata:{},
+        histId:'',
+        histdata:[],
       };
+    },
+    mounted(){
+        let id = this.$route.query.id;
+        apiNote.detail(id).then(res=>{
+           let that = this;
+           that.editdata = res.result
+           that.histId = res.result.id
+           this.hist();
+        })
+        
+    },
+    methods:{
+       restore(item){
+          apiNote.restore(item.id).then(res=>{
+             console.loh(res)
+               this.$message({
+                  message: '还原成功',
+                  type: 'success'
+               });
+               this.hist();
+          })
+       },
+      hist(){
+         apiNote.history(this.histId).then(res=>{
+            console.log(res,'qqq')
+            this.histdata = res.result
+         })
+      },
+
+       savedata(){
+          apiNote.update(this.editdata).then(res=>{
+
+          })
+       }
     }
 }
 </script>
 
 <style lang="scss" scoped>
+.note-input{
+   outline-style: none;
+   border: none;
+   font-size: 14px;
+   font-weight: 400;
+   color: #333333;
+   width: 300px;
+   height: 300px;
+}
 .edti-hist{
    margin: 0;
    font-size: 18px;
@@ -105,12 +129,16 @@ export default {
             font-size: 14px;
          }
          .hist-tit{
-            
+            display: flex;
             font-size: 16px;
             font-weight: 600;
             color: #666666;  
+            div{
+               flex: 1;
+            }
             span{
-               float: right;
+               width: 60px;
+               left: auto;
                color: #387DF7;
                font-weight: 400;
                font-size: 16px;
@@ -147,6 +175,14 @@ export default {
    font-size: 14px;
    font-weight: 400;
    color: #333333;
+   input{
+      border: none;
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      width: 100%;
+      height: 100px;
+   }
 }
 .note-tit{
    padding-top: 30px;