12-2

src/components/Tinymce/index.vue

@@ -59,7 +59,7 @@ export default {
     },
     showUpload: {
       type: Boolean,
-      default: true
+      default: false
     },
     id: {
       type: String,
@@ -306,7 +306,7 @@ export default {
       }
     },
     setContent(value) {
-      console.log(value,'value')
+      console.log(value, 'value')
       window.tinymce.get(this.tinymceId).setContent(value)
     },
     getContent() {

src/views/friendlyLinks/list.vue

@@ -6,10 +6,10 @@
       <el-input v-model="params.search" clearable placeholder="链接名称" prefix-icon="el-icon-search"
         @keyup.enter.native="toSearch()" @clear="toSearch()" />
       <el-button type="primary" icon="el-icon-search" :loading="loadingFull" @click="toSearch()">搜索</el-button>
-      <el-button @click="handleEdit(0)" type="primary" style="margin-right:24px;">添加</el-button>
-      <el-upload class="upload-demo" action="" :http-request="uploadFile" :multiple="false" :show-file-list="false">
+      <!-- <el-button @click="handleEdit(0)" type="primary" style="margin-right:24px;">添加</el-button> -->
+      <!-- <el-upload class="upload-demo" action="" :http-request="uploadFile" :multiple="false" :show-file-list="false">
         <el-button type="primary">导入</el-button>
-      </el-upload>
+      </el-upload> -->
     </div>
     <div class="table_box">
       <el-table ref="list" :data="listData" align="center" :header-cell-style="{ background: '#f8fbfc' }"
@@ -27,7 +27,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <el-dialog :title="type === 0 ? '添加友情链接' : '编辑友情链接'" :visible.sync="dialogVisible" width="35%">
+    <el-drawer :title="type === 0 ? '添加友情链接' : '编辑友情链接'" :visible.sync="dialogVisible" size="48%">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
         <el-form-item label="名称" prop="name">
           <el-input v-model="ruleForm.name" placeholder="请输入链接名称" />
@@ -39,14 +39,14 @@
           <el-input v-model="ruleForm.sort" type="number" placeholder="请输入链接排序，数字越大越靠前" />
         </el-form-item>
         <el-form-item label="简介:" prop="introduction">
-          <textarea name="" id="" cols="30" rows="10" v-model="ruleForm.introduction" placeholder="请输入链接简介" />
+          <tinymce v-model="ruleForm.introduction" :height="300" width="90%" menubar="" />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="submitForm('ruleForm')">{{ type === 0 ? '确 定' : '保存' }}</el-button>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('ruleForm')">{{ type === 0 ? '确 定' : '保存' }}</el-button>
-      </span>
-    </el-dialog>
+    </el-drawer>
     <div class="paging_box">
       <pagination :total="listDataTotal" :limit="params.page_size" :page="params.page_index"
         @pagination="changePagination" @update:limit="changePagination" />
@@ -55,6 +55,7 @@
 </template>
 <script>
 import { linkList, addLink, editLink, deleteLink, importLink } from '@/api/friendlyLinks'
+import Tinymce from '@/components/Tinymce'
 export default {
   data() {
     return {
@@ -91,6 +92,9 @@ export default {
   mounted() {
     this.getList()
   },
+  components: {
+    Tinymce
+  },
   methods: {
     // 搜索
     toSearch() {

src/views/module/industry.vue

@@ -37,7 +37,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="内容:" prop="content" required>
-                    <tinymce v-model="ruleForm.content" :height="300" width="85%" :showUpload="false" menubar=""/>
+                    <tinymce v-model="ruleForm.content" :height="300" width="85%" :showUpload="true" menubar="" />
                 </el-form-item>
                 <el-form-item>
                     <el-button @click="dialogVisible = false">取 消</el-button>

src/views/notice/notice.vue

@@ -52,13 +52,12 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item v-for="(item, i) in categoryList" :key="i" :label="item.name" :prop="item.mark">
-                    <el-select v-model="ruleForm[item.mark]" :placeholder="'请选择' + item.name" :ref="'template_' + i"
-                        @visible-change="(v) => visibleChange(v, `template_${i}`, item.id)" :style="{ width: '300px' }"
+                    <el-select v-model="ruleForm[item.mark]" :placeholder="'请选择' + item.name" :ref="'template_' + i" :style="{ width: '300px' }"
                         filterable clearableruleFormruleForm style="width:300px">
                         <el-option v-for="(temp, idx) in item.children" :key="idx" :label="temp.name" :value="temp.id">
                             <span style="float: left" class="span-style">{{ temp.name }}</span>
-                            <span style="float: right" class="span-style-delete" @click.stop="deleteItem(temp)">
-                                <i class="el-icon-delete" /></span>
+                            <!-- <span style="float: right" class="span-style-delete" @click.stop="deleteItem(temp)">
+                                <i class="el-icon-delete" /></span> -->
                             <span style="float: right;margin-left:5px;" class="span-style"
                                 @click.stop="editItem(item.id, 1, temp, i)">
                                 <i class="el-icon-edit-outline" />