From 70035db613afdf5885b020a9b753c4e0f1a1d2e7 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 13 Mar 2024 09:46:47 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20style=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tinymce/index.vue      | 15 +++++++++++++--
 src/components/tag-select/main.vue    |  1 +
 src/views/tenant/main/serve/index.vue | 14 ++++++--------
 vue.config.js                         |  4 ++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 77b9be0..d41a0b2 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -23,7 +23,17 @@ export default {
       required: false,
       default: 360
     },
-    value:{type:String,default:""}
+    value:{type:String,default:""},
+    visibleToolbar: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    visibleMenubar: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
   },
   data() {
     return {
@@ -48,7 +58,8 @@ export default {
         selector: `#${this.tinymceId}`,
         language:'zh_CN',
         plugins: plugins,
-        toolbar: toolbar,
+        toolbar: this.visibleToolbar ? toolbar : false,
+        menubar: this.visibleMenubar ? true : false,
         height: this.height,  //编辑器高度
         min_height: 400,
         fontsize_formats: '12px 14px 16px 18px 24px 36px 48px 56px 72px',
diff --git a/src/components/tag-select/main.vue b/src/components/tag-select/main.vue
index 4c8aeb8..f43b1c5 100644
--- a/src/components/tag-select/main.vue
+++ b/src/components/tag-select/main.vue
@@ -94,6 +94,7 @@ export default {
     },
     canSelect: { type: Boolean, default: true },
     loading: Boolean,
+
     prop: {
       type: Object,
       default() {
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index 1a0bc49..65b1506 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -253,19 +253,15 @@
                   <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{ item }}</el-tag>
                 </div>
               </template>
-              <template slot="policyContentForm" slot-scope="{row}">
-                <div>
-                  {{row.policyContent}}
-                </div>
-              </template>
+
               <template slot="guidelineContentForm" slot-scope="{row}">
                 <div>
-                  {{row.guidelineContent}}
+                  <Tinymce v-model="row.guidelineContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
                 </div>
               </template>
               <template slot="policyContentForm" slot-scope="{row}">
                 <div>
-                  {{row.policyContent}}
+                  <Tinymce v-model="row.policyContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
                 </div>
               </template>
 
@@ -325,6 +321,7 @@ import { excelAccept } from "@/common/accept";
 import missionView from "../../mission/Table/missionView.vue";
 import workView from "../../works/Table/missionView.vue"
 import {serviceType} from "@/common/dic";
+import Tinymce from "@/components/Tinymce";
 const page = {
   pageSize: 10,
   currentPage: 1,
@@ -424,7 +421,7 @@ export default {
       excelForm: { isCovered: 1 },
     };
   },
-  components: { addGroups, transferGroups, Resume, ied, missionView, workView},
+  components: { addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce},
   watch: {},
   computed: {
     ...mapGetters(["permission"]),
@@ -712,6 +709,7 @@ export default {
             label: '政策内容',
             prop: 'policyContent',
             slot: true,
+            hide: true,
             formslot: true,
             span: 24,
           },
diff --git a/vue.config.js b/vue.config.js
index 85d0d59..5946086 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,9 +24,9 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://localhost:8000', // 本地服务接口地址
-        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        target: "http://39.98.184.58:8000",  // 阿里云后台地址
         // target: "http://192.168.3.108:8000",  // 本地
-        target: 'http://192.168.3.111:8000',
+        // target: 'http://192.168.3.111:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {