From 183c7829e450552345f8aa0c2d402a9cbe25eaae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 16 Aug 2022 16:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mdp/arc/image.js                      | 11 ++++++++-
 src/components/Tinymce/index.vue              | 23 ++++++++++---------
 .../xm/core/xmQuestion/XmQuestionEdit.vue     |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/api/mdp/arc/image.js b/src/api/mdp/arc/image.js
index 480a0827..fbed7413 100644
--- a/src/api/mdp/arc/image.js
+++ b/src/api/mdp/arc/image.js
@@ -31,4 +31,13 @@ export const addImage = params => { return axios.post(`${base}/mdp/arc/image/add
 //获取图片分类名
 export const listTags = params => { return axios.get(`${base}/mdp/arc/image/listTags`, params); };
 
-export const uploadBase64 = params => { return axios.post(`${base}/mdp/arc/image/upload/base64`, params); };
\ No newline at end of file
+export const uploadBase64 = params => { return axios.post(`${base}/mdp/arc/image/upload/base64`, params); };
+
+export const upload = params=>{
+
+    return axios.post(`${base}/mdp/arc/image/upload`, params, {
+            headers: {
+              'Content-Type': 'multipart/form-data'
+            }
+          }) 
+}
\ No newline at end of file
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 96fceeed..909a80e1 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -32,7 +32,7 @@
 <script>
 import config from "@/common/config"; //全局公共库import
 import UploadImage from "@/components/Image/UploadImage";
-import { uploadBase64  } from '@/api/mdp/arc/image';
+import { uploadBase64,upload  } from '@/api/mdp/arc/image';
 import { mapGetters } from "vuex";
 import plugins from "./plugins";
 import toolbar from "./toolbar";
@@ -66,6 +66,7 @@ export default {
     var tinymceId="vue-tinymce-" + new Date().getTime() + ((Math.random() * 1000).toFixed(0) + "")
     return {
       uploadAction: config.getArcImagePath()+"/arc/image/upload", 
+      uploadBlogAction: config.getArcImagePath()+"/arc/image/upload/base64", 
       uploadOptions:{branchId:'',categoryId:'uploadImm',fileName:'',remark:'',deptid:''},//当前选择上传图片的类型
       imageList: [],
       dialogVisible: false,
@@ -156,6 +157,7 @@ export default {
           editor.on("FullscreenStateChanged", (e) => {
             _this.fullscreen = e.state;
           });  
+          /**
           editor.addButton('insertImage', {
             text: "插入图片",
             icon: false,
@@ -163,6 +165,7 @@ export default {
                 document.getElementById(_this.tinymceId+"-uploadImageBtn").click(); 
             },
           });
+          **/
           editor.addButton("imageList", {
             text: "图片库",
             icon: false,
@@ -189,17 +192,15 @@ export default {
         //   }, 0);
         //   return img
         // },
-        // images_upload_handler(blobInfo, success, failure, progress) { 
-        //     const formData = new FormData();  
-        //     formData.append('file', blobInfo.blob(), url);
-        //     var params=this.uploadOptions;
-        //     params.storedb="0"
-        //     params.fileData=blobInfo.blob();
-        //     uploadBase64(formData).then((res) => {
-        //        handleConfirm([res.data])
-        //     })
+        images_upload_handler(blobInfo, success, failure, progress) {   
+             const formData = new FormData();   
+             formData.append('file', blobInfo.blob()); 
+             formData.append("categoryId",_this.uploadOptions.categoryId) 
+             upload(formData).then((res) => {  
+                success(res.data.data.url)
+             })
           
-        // },
+         },
       });
       _this.setContent(_this.value);
     },
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 669090d9..07181963 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -70,7 +70,7 @@
 										<el-form-item label="" prop="description" label-width="0px">  
 												<vue-editor v-if="visible && activateTabPaneName=='12'" class="rich-context" :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.description"></vue-editor> 
 										</el-form-item>
-										<el-row style="float:right;">
+										<el-row style="float:right;" v-if="opType!=='add'">
 												<el-button @click.native="handleCancel">取消</el-button>
 												<el-button v-loading="load.edit"  v-if="editForm.description!==editFormBak.description" type="primary" @click.native="editXmQuestionSomeFields(editForm,'description',editForm.description)" :disabled="load.edit==true">保存</el-button> 
 										</el-row>