From 74aaa15c1a73f87d1767217aabd9df52dc98073b Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 28 Sep 2022 11:41:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=20->=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Mynotes.vue | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index 91bb2ce9..5c5f3539 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -22,7 +22,7 @@
                         <el-dropdown-item command="2">Word</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
-                
+
             </div>
         </div>
         <div class="note-sift">
@@ -34,7 +34,7 @@
                 type="daterange"
                 start-placeholder="开始"
                 end-placeholder="结束">
-                </el-date-picker> 
+                </el-date-picker>
             <el-dropdown  @command="handleCommand">
                     <el-button>
                       全部课程<i class="el-icon-arrow-down el-icon--right"></i>
@@ -44,12 +44,12 @@
                     </el-dropdown-menu>
                 </el-dropdown>
             <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>
@@ -84,7 +84,7 @@
                   <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>
                     <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"> 
+                    <el-button @click="edit(item)" class="textbut" type="text">
                          <svg-icon icon-class="noteedit" ></svg-icon> 编辑</el-button>
                   </div>
                   </div>
@@ -202,7 +202,7 @@ export default {
             contentType:null,
             limit:1,
         },
-        
+
         uploadFileUrl: process.env.VUE_APP_BASE_API + '/xboe/sys/xuploader/file/upload',
         text:'',
         importDialogVisible:false,
@@ -234,7 +234,7 @@ export default {
            orderpiss:true,
            Filtertime:[],
       }
-      
+
 
   },
   mounted(){
@@ -261,7 +261,7 @@ export default {
         } else {
             apiNote.exportExcel(ids).then(res=>{
                 const link = document.createElement('a');// 创建a标签
-                let blob = new Blob([res],{type: 'application/vnd.ms-excel;charset=UTF-8'}); // 设置文件类型 
+                let blob = new Blob([res],{type: 'application/vnd.ms-excel;charset=UTF-8'}); // 设置文件类型
                 link.style.display = "none";
                 link.href = URL.createObjectURL(blob); // 创建URL
                 link.setAttribute("download", "我的笔记.xls");
@@ -275,11 +275,11 @@ export default {
         if(this.noteFile.courseName == '') {
            this.$message.warning('请填写标题！');
            return
-        } 
+        }
         if(this.noteFile.filePath == '') {
            this.$message.warning('您还没有上传文件！');
            return
-        } 
+        }
         this.noteFile.contentType = this.upNoteFile.contentType;
         if(this.upNoteFile.content.length > 0) {
             this.noteFile.filePath = this.upNoteFile.content.join();
@@ -357,14 +357,14 @@ export default {
           this.$message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
       },
       couresitem(item){
         this.courseId = item.courseId;
         this.noteData(this.num)
       },
-     
+
       allcoures(){
         apiNote.course().then(res=>{
             this.couresna = res.result
@@ -383,9 +383,9 @@ export default {
          this.noteData(this.num)
       },
       handleClose(done) {
-        
 
-         
+
+
       },
       edit(item){
       this.$router.push({ path: `/user/Noteedit?id=${item.id}` });
@@ -412,7 +412,7 @@ export default {
                 this.datalist = res.result.list;
                 this.count = res.result.count;
             }
-          
+
         })
       },
 
@@ -463,7 +463,7 @@ export default {
                 font-size: 16px;
                 color: #666666;
                 font-weight: 400;
-               
+
             }
         }
     }
@@ -473,7 +473,7 @@ export default {
 .el-input--medium .el-input__inner{
     height: 40px;
     line-height: 40px;
-} 
+}
 .el-dropdown-menu--medium .el-dropdown-menu__item{
     width: 100% !important;
     // height: 30px !important;
@@ -490,7 +490,7 @@ export default {
     li{
         text-align: center;
     }
-  
+
 }
 .el-popper{
     margin-top: 5px;
@@ -573,7 +573,7 @@ export default {
         font-size: 12px;
         font-weight: 400;
         color: #6E7B84 !important;
-       
+
 }
 .note-all{
     width: 100%;
@@ -598,7 +598,7 @@ export default {
                margin-right: 23px;
            }
        }
-      
+
     }
 }
 .tabcontent{
@@ -674,4 +674,4 @@ export default {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>

From 1d4952965e193652cba63c5553fd90b700c9f1da Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 28 Sep 2022 12:28:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9ApostJsonToFile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/ajax.js b/src/api/ajax.js
index 12d1de2b..11881980 100644
--- a/src/api/ajax.js
+++ b/src/api/ajax.js
@@ -141,7 +141,7 @@ const postJson=function(baseURL,url,postData){
    })
 }
 
-// 导出文件请求
+// 导出文件请求定义
 const postJsonToFile=function(baseURL,url,postData){
    return request({
     baseURL,

From 3141f79eb5dd689bdb08125e80fa8604c686f7b3 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 28 Sep 2022 12:32:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=AC=94=E8=AE=B0=E7=9A=84=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/phase2/note.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js
index 1c69aa7c..fef48e8e 100644
--- a/src/api/phase2/note.js
+++ b/src/api/phase2/note.js
@@ -110,7 +110,7 @@ const ids=function (data){
  * }
  * */
 const exportExcel=function (data){
-  return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
+  return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
 }
 
 /**