'normal'

src/components/Tinymce/components/EditorImage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="upload-container">
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
-      upload
+      上传图片
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
       <el-upload
@@ -16,14 +16,14 @@
         list-type="picture-card"
       >
         <el-button size="small" type="primary">
-          Click upload
+          点击上传
         </el-button>
       </el-upload>
       <el-button @click="dialogVisible = false">
-        Cancel
+        取消
       </el-button>
       <el-button type="primary" @click="handleSubmit">
-        Confirm
+        确认
       </el-button>
     </el-dialog>
   </div>

src/main.js

@@ -22,6 +22,7 @@ Vue.component(ElementUI.Message)
 import * as filters from './filters' // global filters
 
 
+
 // Vue.use(Element, {
 //   size: Cookies.get('size') || 'medium', // set element-ui default size
 //   locale: enLang // 如果使用中文，无需设置，请删除

src/pages/other/file-add.vue

@@ -3,40 +3,54 @@
     <div class="main-body">
       <el-form class="p20" label-width="100px"  label-position="left"
       ref="elForm" :model="info" :rules="rules" >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="所属部门" class="mt20" prop="department">
+             <el-select v-model="info.department"
+              @change="selectDepartment($event)"
+              collapse-tags placeholder="请选择"  clearable>
+               <el-option
+               v-for="item in showDepartments"
+               :value="item"
+               :key="item.departmentId">
+               {{item.department}}
+               </el-option>
+             </el-select>
 
-         <el-form-item label="所属部门" class="mt20" prop="department">
-           <el-select v-model="info.department"
-            @change="selectDepartment($event)"
-            collapse-tags placeholder="请选择"  clearable>
-             <el-option
-             v-for="item in showDepartments"
-             :value="item"
-             :key="item.departmentId">
-             {{item.department}}
-             </el-option>
-           </el-select>
-         </el-form-item>
+            </el-form-item>
+          </el-col>
 
-         <el-form-item label="所属分类" class="mt20" prop="category">
-             <el-select v-model="info.category" collapse-tags placeholder="请选择"  clearable>
-               <el-option v-for="(item,index) in categorys"
-               :value="index" :key="index" :label="item"></el-option>
-             </el-select>
-         </el-form-item>
+          <el-col :span="8">
+             <el-form-item label="所属分类" class="mt20" prop="category">
+                 <el-select v-model="info.category" collapse-tags placeholder="请选择"  clearable>
+                   <el-option v-for="(item,index) in categorys"
+                   :value="index" :key="index" :label="item"></el-option>
+                 </el-select>
+             </el-form-item>
+          </el-col>
 
-         <el-form-item label="是否公开" class="mt20" prop="category">
-             <el-switch :active-value="1" :inactive-value="0" v-model="info.isOpen"></el-switch>
-         </el-form-item>
+          <el-col :span="8">
+            <el-form-item label="是否公开" class="mt20" prop="category">
+                <el-switch :active-value="1" :inactive-value="0" v-model="info.isOpen"></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-         <el-form-item label="文件标题" class="mt20" prop="title">
-             <el-input class="ipt-select" v-model="info.title"></el-input>
+         <el-form-item label="文件标题"  prop="title">
+             <el-input  v-model="info.title" type="textarea"></el-input>
          </el-form-item>
+         
+         <el-form-item label="文章简介"  prop="title">
+          
+          </el-form-item>
+          
 
-         <el-form-item label="文件简介" class="mt20" prop="brief">
-             <el-input class="ipt-select" type="textarea" v-model="info.brief"></el-input>
+         <el-form-item label="" class="mt20" prop="brief" label-width="0">
+           <tinymce v-model="info.brief" :height="500" />
+             <!-- <el-input class="ipt-select" type="textarea" v-model="info.brief"></el-input> -->
          </el-form-item>
 
-         <el-form-item label="上传文件"  prop="filename">
+         <el-form-item label="上传附件"  prop="filename">
             <upload-file  placeholder="上传文档"  @rmImage="info.filename=''"  @onFinish="onUpload"/>
          </el-form-item>
 
@@ -56,12 +70,13 @@
 
 <script>
   import UploadFile from "@/components/Upload/uploadFile.vue";
+  import Tinymce from "@/components/Tinymce/index.vue";
   import data  from '../data/data.js'
   import {mapGetters } from 'vuex'
   import {addArtical} from '@/api/article.js'
   export default {
     name: 'application',
-    components:{ UploadFile },
+    components:{ UploadFile,Tinymce },
     data() {
       return {
         loading:false,
@@ -136,14 +151,15 @@
          });
       },
       onSubmit(){
-        this.$refs["elForm"].validate((valid) => {
-          if (!valid) return;
-          addArtical( this.info ).then(res=>{
-            if( res.code == 200){
-              this.showFinish()
-            }
-          })
-        })
+        console.log( this.info )
+        // this.$refs["elForm"].validate((valid) => {
+        //   if (!valid) return;
+        //   addArtical( this.info ).then(res=>{
+        //     if( res.code == 200){
+        //       this.showFinish()
+        //     }
+        //   })
+        // })
       }
     }
   }