xujun

src/views/components/common/myEditor.vue

@@ -51,9 +51,8 @@ export default {
         statusbar: false,
         height: 600,
         plugins: 'code advlist autolink link image lists preview table wordcount',
-        toolbar: `undo redo | styleselect | fontsizeselect fontselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | image 
-                    | table tabledelete | tableprops tablerowprops tablecellprops | tableinsertrowbefore tableinsertrowafter tabledeleterow
-                    | tableinsertcolbefore tableinsertcolafter tabledeletecol | wordcount`,
+        toolbar: `undo redo | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | image | wordcount`, 
+        //| styleselect | fontsizeselect fontselect | table tabledelete | tableprops tablerowprops tablecellprops | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol
         // 初始化完成回调
         init_instance_callback: (editor) => {
           if (_this.value) {

src/views/report/talent/components/talentEdit.vue

@@ -412,7 +412,7 @@
         <a-row type="flex" class="row_center">
           <a-col :span="24" class="bg-gray">
             <a-form-model-item prop="researchCondition" :rules="{ required: true, message: '*', trigger: 'blur',}">
-              <a-textarea placeholder="研究条件(限1000字)" v-model="formData.researchCondition" :maxLength="1000" style="width: 80%; height: 160px; margin-top: 12px" />
+              <my-editor v-model="formData.researchCondition" id="my_researchCondition" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -530,11 +530,12 @@ import scientificGainEdit from '@/views/report/talent/components/scientificGainE
 import membersEdit from '@/views/report/talent/components/membersEdit'
 import budgetEdit from '@/views/report/talent/components/budgetEdit'
 import fileEdit from '@/views/report/talent/components/fileEdit'
+import myEditor from '@/views/components/common/myEditor'
 
 export default {
   name: "talentEdit",
   components: {
-    paraRadio, paraCheck, cascaderSelect, resumeEdit, scientificGainEdit, membersEdit, budgetEdit, fileEdit
+    paraRadio, paraCheck, cascaderSelect, resumeEdit, scientificGainEdit, membersEdit, budgetEdit, fileEdit, myEditor
   },
   props: {
     value: {

src/views/report/talent/components/talentInfo.vue

@@ -346,7 +346,7 @@
       <a-row type="flex">
         <a-col :span="24">
           <div class="special-middle">
-            <div v-html="toTextarea(value.researchCondition)"></div>
+            <div v-html="value.researchCondition"></div>
           </div>
         </a-col>
       </a-row>