clay commit : tinymce编辑器集成完毕

ebts-ui/src/views/sist/article/components/approve.vue

@@ -64,12 +64,7 @@
 
 <script>
 import {approve, getArticle, rejected} from "@/api/sist/article";
-import Editor from '@/views/utils/Editor'
-import {parseTime} from "@/utils/hcy";
  export default {
-  components: {
-    Editor
-  },
   name: "approve",
   data() {
     return {

ebts-ui/src/views/sist/article/components/article.vue

@@ -139,7 +139,7 @@
       </el-row>
       <el-row>
         <el-col :offset="1" :span="22">
-          <Editor v-model="formData.content" :height="800"/>
+          <TinymceEditor v-model="formData.content"></TinymceEditor>
         </el-col>
       </el-row>
       <el-row>
@@ -155,7 +155,8 @@
 </template>
 <script>
 // import ArticleFile from './ArticleFile'
-import Editor from '@/views/utils/Editor'
+// import Editor from '@/views/utils/Editor'
+import TinymceEditor from '@/views/utils/tinymce/Tinymce'
 import {updateArticle, getArticle, drafts, getArticleType, getArticleApprove} from "@/api/sist/article";
 import {Message} from "element-ui";
 import UploadFile from '@/views/utils/uploadFile.vue';
@@ -163,9 +164,10 @@ import { getArticleNav } from '../../../../api/sist/article'
 import { getToken } from '../../../../utils/auth'
 import { addFile, delFile } from '../../../../api/sist/file'
 
+
 export default {
   components: {
-    Editor,
+    TinymceEditor,
     UploadFile,
     // ArticleFile
   },

ebts-ui/src/views/sist/navigation/articleEdit.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="editor">
+    <el-form :model="formData" size="medium" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <!--            <el-form-item label="详情标题" prop="title">-->
+          <el-form-item label="详情标题">
+            <el-input v-model="formData.title" placeholder="请输入详情标题" clearable :style="{width: '100%'}">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :offset="1" :span="22">
+          <Editor ref="editor" v-model="formData.content" :height="500"/>
+          <!--            <CodeEdit ref="codeEdit" v-model="formData.content" :height="500"/>-->
+          <!--            <CustomEditor v-model="formData.content" :height="500"/>-->
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24" class="save">
+          <el-form-item size="large">
+            <el-button type="primary" @click="save">保存</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getDetails, updateDetails } from '../../../api/sist/navigation'
+import Editor from '@/views/utils/tinymce/Tinymce'
+export default {
+  name: 'articleEdit',
+  components: {
+    Editor
+  },
+  data() {
+    return {
+      formData: {
+        title: '',
+        content: ''
+      }
+    }
+  },
+  created() {
+    let refId = this.$route.params && this.$route.params.refId;
+    let navId = this.$route.params && this.$route.params.navId;
+    this.handleUpdateDetails(refId)
+  },
+  methods:{
+    handleUpdateDetails(id) {
+      this.formData = {
+        id: id,
+        title: '',
+        content: ''
+      }
+      getDetails(id).then(res => {
+        if (res.data){
+          this.formData = res.data
+        }
+      })
+    },
+    save() {
+      let that = this
+      updateDetails(this.formData).then(res => {
+        that.msgSuccess('修改成功')
+        that.close()
+      })
+    },
+    close() {
+      this.$store.dispatch("tagsView/delView", this.$route);
+      this.$router.push({path: "/sist/navigation/", query: {t: Date.now()}})
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.save {
+  //text-align: center;
+  margin-top: 20px;
+}
+.editor{
+  margin-top: 20px;
+}
+</style>

ebts-ui/src/views/sist/navigation/index.vue

@@ -72,14 +72,14 @@
                      size="mini"
                      type="text"
                      icon="el-icon-edit"
-                     @click="handleUpdateDetails(scope.row.refId)"
+                     @click="handleUpdateDetails(scope.row.refId,scope.row.id)"
           >修改中文详情
           </el-button>
           <el-button v-show="scope.row.type == '1'"
                      size="mini"
                      type="text"
                      icon="el-icon-edit"
-                     @click="handleUpdateDetails(scope.row.enRefId)"
+                     @click="handleUpdateDetails(scope.row.enRefId,scope.row.id)"
           >修改英文详情
           </el-button>
           <el-button v-show="scope.row.pid != 0"
@@ -250,7 +250,8 @@ import {
 } from '@/api/sist/navigation'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import Editor from '@/views/utils/Editor'
+// import Editor from '@/views/utils/Editor'
+import Editor from '@/views/utils/tinymce/Tinymce'
 import CodeEdit from '@/views/utils/CodeEdit'
 import UploadFile from '@/views/utils/uploadFile'
 import { getArticleNav } from '../../../api/sist/article'
@@ -473,16 +474,17 @@ export default {
       this.form.type = '0'
       this.title = '添加下级导航'
     },
-    handleUpdateDetails(id) {
-      this.detailsShow = true
-      this.formData = {
-        id: id,
-        title: '',
-        content: ''
-      }
-      getDetails(id).then(res => {
-        this.formData = res.data
-      })
+    handleUpdateDetails(refId,navId) {
+      this.$router.push('/navigation/edit/' + refId+'/'+navId)
+      // this.detailsShow = true
+      // this.formData = {
+      //   id: id,
+      //   title: '',
+      //   content: ''
+      // }
+      // getDetails(id).then(res => {
+      //   this.formData = res.data
+      // })
     },
     code(){
       let html = this.$refs.editor.getHtml()