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

src/api/ajax.js

@@ -141,6 +141,19 @@ const postJson=function(baseURL,url,postData){
    })
 }
 
+// 导出文件请求定义
+const postJsonToFile=function(baseURL,url,postData){
+   return request({
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+   })
+}
+
+
 /**
  * put请求
  */
@@ -174,6 +187,7 @@ export default {
     get,
     post,
     postJson,
+    postJsonToFile,
     put,
     putJson,
 }

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);
 }
 
 /**

src/views/user/Mynotes.vue

@@ -44,7 +44,7 @@
                     </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>
@@ -276,14 +276,14 @@ export default {
            this.$message.warning('请填写标题！');
            return
         }
-        this.noteFile.contentType = this.upNoteFile.contentType;
-        if(this.upNoteFile.content.length > 0) {
-            this.noteFile.filePath = this.upNoteFile.content.join();
-        }
         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();
+        }
         apiNote.save(this.noteFile).then(res=>{
             if(res.status == 200) {
                 this.$message.success('导入笔记成功');

src/views/user/Noteedit.vue

@@ -11,17 +11,11 @@
                 <h3> {{ editdata.courseName }} </h3>
                 <div v-if="editdata.playTime != ''"><img src="../../../public/images/coteplay.png" alt="">8:40</div>
             </div>
-            <div class="note-text" v-if="editdata.contentType != 3">
+            <div class="note-text">
                <!-- <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;" maxlength="200"
   show-word-limit></textarea>
             </div>
-            <div class="note-text" v-else>
-               <div class="img-box" v-for="(img,index) in imgContent">
-                  <img  :src="fileBaseUrl + img" alt=""/>
-                  <span class="del-icon"><i class="el-icon-delete" @click="imgDel(index)"></i></span>
-               </div>
-            </div>
          </div>
          <div class="edit-footer">
            <el-radio-group v-model="editdata.openType">
@@ -46,14 +40,9 @@
                   </div>
                   <span class="pointer" @click="restore(item)"> <i class="el-icon-refresh-left"></i> 还原</span>
                </div>
-               <div class="hist-text" v-if="editdata.contentType != 3">
+               <div class="hist-text">
                  {{ item.beforeContent }}
                </div>
-               <div class="hist-text" v-else>
-                 <template class="img-box" v-for="(before,index) in item.beforeContent">
-                  <img style="width:40px;height:65px;margin-right:10px" :src="fileBaseUrl + before" alt=""/>
-                 </template>
-               </div>
             </div>
          </div>
       </div>
@@ -65,8 +54,6 @@ import apiNote from '@/api/phase2/note.js'
 export default {
    data () {
       return {
-         imgContent:[],
-       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
        isShowList:false,
        isShowTip:'',
         radio: '1',
@@ -88,21 +75,14 @@ export default {
       },30000 *10);
     },
     methods:{
-      imgDel(index) {
-         this.imgContent.splice(index,1);
-      },
        comeback(){
           this.$router.go(-1);
        },
        notedetail(){
            apiNote.detail(this.id).then(res=>{
-            if(res.result.contentType == 3 && res.result.content != '') {
-               this.imgContent = res.result.content.split(',');
-           }
            this.editdata = res.result;
            this.editdata.openTypeBackups = res.result.openType;
            this.histId = res.result.id;
-          
            this.hist();
         })
        },
@@ -112,7 +92,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-         this.imgContent = item.beforeContent;
+         this.editdata.content = item.beforeContent;
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -131,12 +111,6 @@ export default {
        },
       hist(){
          apiNote.history(this.histId).then(res=>{
-            if(this.editdata.contentType == 3) {
-               res.result.forEach(item=>{
-                  item.beforeContent = item.beforeContent.split(',');
-               })
-               
-            }
             this.histdata = res.result
          })
       },
@@ -150,9 +124,6 @@ export default {
          }
          if(num == 1) {
             this.editdata.isAuto = true;
-         }
-         if(this.imgContent.length > 0) {
-            this.editdata.content = this.imgContent.join();
          }
           apiNote.update(this.editdata).then(res=>{
             if(res.status == 200) {
@@ -285,23 +256,6 @@ export default {
    font-size: 14px;
    font-weight: 400;
    color: #333333;
-   display: flex;
-   flex-wrap: wrap;
-   .img-box{
-      position: relative;
-      // display: flex;
-      .del-icon{
-         display: inline-block;
-         position: absolute;
-         top:0;
-         right:20px;
-      }
-   }
-   img{
-      width: 140px;
-      height: 175px;
-      margin-right: 23px;
-   }
    input{
       border: none;
       font-size: 14px;