diff --git a/src/api/resource/oss.js b/src/api/resource/oss.js index d7d71c6..3bf3b53 100644 --- a/src/api/resource/oss.js +++ b/src/api/resource/oss.js @@ -63,7 +63,7 @@ export const putFileFun = (file, onUploadProgress) => { data.append('file', file); return request({ - url: '/api/jobslink-api/resource/oss/endpoint/put-file', + url: '/api/jobslink-api/resource/file/save?bussinessType=11', method: 'post', headers: {'Content-Type': 'multipart/form-data'}, data, diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index dc7f086..77b9be0 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -62,7 +62,8 @@ export default { images_upload_handler: function (blobInfo, succFun) { var file = blobInfo.file ? blobInfo.file : blobInfo.blob() putFileFun(file).then(e => { - succFun(e.data.data.link) + // console.log(e.data.msg) + succFun(e.data.msg) }) }, setup:(ed) => { diff --git a/src/components/Tinymce/toolbar.js b/src/components/Tinymce/toolbar.js index 8d40b43..920abe6 100644 --- a/src/components/Tinymce/toolbar.js +++ b/src/components/Tinymce/toolbar.js @@ -1,6 +1,10 @@ const toolbar = 'code undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \ styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \ - table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em axupimgs' + table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em' + +// const toolbar = 'code undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \ +// styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \ +// table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em axupimgs' export default toolbar diff --git a/src/components/tag-select/main.vue b/src/components/tag-select/main.vue index 574b966..ef833fa 100644 --- a/src/components/tag-select/main.vue +++ b/src/components/tag-select/main.vue @@ -128,7 +128,11 @@ export default { return data; }, }, - watch: {}, + watch: { + value(old, ew) { + console.log(old, ew) + } + }, methods: { /*技能*/ editSkill(tag) { diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue index 68e9abd..500c664 100644 --- a/src/views/tenant/main/serve/index.vue +++ b/src/views/tenant/main/serve/index.vue @@ -81,9 +81,17 @@