flat: 123

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,

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) => {

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

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) {

src/views/tenant/main/serve/index.vue

@@ -81,9 +81,17 @@
               <div v-else>暂无简历</div>
             </div>
           </template>
+          <template slot="serveLabels" slot-scope="{ row }">
+              <el-tooltip effect="dark" placement="top">
+                <div slot="content">
+                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index"><div>{{item}}</div></div>
+                </div>
+                <span>{{ row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` :  row.serveLabels}}</span>
+              </el-tooltip>
+            </template>
           <!--/自定义列-->
           <template slot="serveLabelsForm">
-            <tag-select v-model="selectedWorkTypes" :prop="{ label: 'name', value: 'name' }" :data="worktypeData">
+            <tag-select v-model="selectLabelNameTypes" :prop="{ label: 'name', value: 'name' }" :data="worktypeData">
             </tag-select>
           </template>
           <!--自定义按钮-->
@@ -530,6 +538,7 @@ export default {
                 trigger: ["blur"],
               },
             ],
+            slot: true,
             formslot: true,
           },
           {
@@ -801,11 +810,11 @@ export default {
     },
     selectLabelNameTypes: {
       get() {
-        if (!this.obj.labelName) {
+        if (!this.obj.serveLabels) {
           return [];
         }
         const result = [];
-        const wt = this.obj.labelName ? this.obj.labelName.split(",") : [];
+        const wt = this.obj.serveLabels ? this.obj.serveLabels.split(",") : [];
         wt.forEach((item) => {
           result.push({ name: item });
         });
@@ -816,7 +825,7 @@ export default {
         val.forEach((item) => {
           arr.push(item.name);
         });
-        this.obj.labelName = arr.join(",");
+        this.obj.serveLabels = arr.join(",");
       },
     },
     worktypeData() {
@@ -1443,7 +1452,7 @@ export default {
         (error) => {
           window.console.log(error);
         })
-    }
+    },
   },
 };
 </script>