Shannon_mu 3 lat temu
rodzic
commit
e25a16cf6e

+ 5 - 5
operationSupport/src/components/Tinymce/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div :class="{ fullscreen: fullscreen }" class="tinymce-container" :style="{ width: containerWidth }">
-        <textarea :id="tinymceId" class="tinymce-textarea" />
+        <textarea :id="tinymceId"  class="tinymce-textarea" />
 
         <!-- <div class="editor-custom-btn-container"> -->
         <!-- <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" /> -->
@@ -134,7 +134,7 @@ export default {
                         let content = window.tinymce.get(this.tinymceId).getContent();
                         let newContent = content.replace(/<img *src="data.*?\/>/g, `<img src='${res.data}' />`);
                         window.tinymce.get(this.tinymceId).setContent(newContent);
-                        resolve && resolve();
+                        // resolve && resolve();
                     } else {
                         this.$message.error(res.msg);
                     }
@@ -185,9 +185,9 @@ export default {
                 toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
                 menubar: false,
                 plugins: plugins,
-                //只保留img标签
-                valid_elements: 'img[src]',
-                extended_valid_elements: 'img[src]',
+                //只保留标签
+                valid_elements: 'img[src],div,span,e',
+                extended_valid_elements: 'img[src],div,span,e',
                 end_container_on_empty_block: true,
                 powerpaste_word_import: 'clean',
                 code_dialog_height: 450,

+ 1 - 1
operationSupport/src/components/common/Home.vue

@@ -7,7 +7,7 @@
  * @FilePath: \vue-manage-system-master\src\components\others\Home.vue
 -->
 <template>
-    <div class="dmp-app">
+    <div class="dmp-app" :class="routePath ? 'newWorkBench' : ''">
         <v-sidebar></v-sidebar>
         <div class="dmp-content" :style="{ width: collapse ? 'calc(100% - 85px)' : 'calc(100% - 220px)' }">
             <v-head></v-head>

+ 1 - 1
operationSupport/src/views/communityoperation/advertisingManagement/setpPage/add.vue

@@ -45,7 +45,7 @@
                 </div>
             </el-form-item>
             <div class="formContent-item_title">投放时间</div>
-            <el-form-item label="巡更日期" prop="startTime">
+            <el-form-item label="投放日期" prop="startTime">
                 <el-date-picker
                     class="width100"
                     v-model="effectiveDate"