Browse Source

修改物业管理-发布公告请求字段

DESKTOP-4G80JF4\long 3 years ago
parent
commit
3ac2d88f34

+ 0 - 1
operationSupport/src/components/Tinymce/index.vue

@@ -122,7 +122,6 @@ export default {
             const _this = this;
             const _this = this;
             window.tinymce.init({
             window.tinymce.init({
                 // fontsize_formats: '8pt 10pt 12pt 13pt 14pt 15pt 16pt 17pt 18pt 19pt 20pt 24pt 36pt',
                 // fontsize_formats: '8pt 10pt 12pt 13pt 14pt 15pt 16pt 17pt 18pt 19pt 20pt 24pt 36pt',
-                fontsize_formats: '8pt 10pt 12pt 13pt 14pt 15pt 16pt 17pt 18pt',
                 language: 'zh_CN',
                 language: 'zh_CN',
                 selector: `#${this.tinymceId}`,
                 selector: `#${this.tinymceId}`,
                 //状态栏指的是编辑器最底下、左侧显示dom信息、右侧显示Tiny版权链接和调整大小的那一条。默认是显示的,设为false可将其隐藏
                 //状态栏指的是编辑器最底下、左侧显示dom信息、右侧显示Tiny版权链接和调整大小的那一条。默认是显示的,设为false可将其隐藏

+ 5 - 1
operationSupport/src/components/Tinymce/toolbar.js

@@ -9,9 +9,13 @@
 //     'hr bullist numlist  insertdatetime    forecolor backcolor fontselect  fontsizeselect fullscreen ',
 //     'hr bullist numlist  insertdatetime    forecolor backcolor fontselect  fontsizeselect fullscreen ',
 //     'searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript'
 //     'searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript'
 // ];
 // ];
+// const toolbar = [
+//     'searchreplace  bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat codesample hr bullist emoticons forecolor backcolor  ',
+//     '<br> fontselect  fontsizeselect fullscreen '
+// ];
 const toolbar = [
 const toolbar = [
     'searchreplace  bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat codesample hr bullist emoticons forecolor backcolor  ',
     'searchreplace  bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat codesample hr bullist emoticons forecolor backcolor  ',
-    '<br> fontselect  fontsizeselect fullscreen '
+    '<br> fontselect   fullscreen '
 ];
 ];
 
 
 export default toolbar;
 export default toolbar;

+ 3 - 1
operationSupport/src/utils/filters.js

@@ -27,6 +27,8 @@ let filtercomplaintType = (val) => {
 };
 };
 // 替换富文本内容
 // 替换富文本内容
 let filterHtml = (val) => {
 let filterHtml = (val) => {
-    return val ? val.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, '图片') : '---';
+    let reg = new RegExp(`<img class="wscnph" src />`, 'g');
+    let newContent = val.replace(reg, '');
+    return newContent;
 };
 };
 export default { filterTime, filterTimeNumber, filterComplaintStatus, filtercomplaintType, filterHtml };
 export default { filterTime, filterTimeNumber, filterComplaintStatus, filtercomplaintType, filterHtml };

+ 1 - 3
operationSupport/src/views/propertyManagement/inform.vue

@@ -754,9 +754,7 @@ export default {
                             userId: this.ruleForm.issueRoom.checkAll
                             userId: this.ruleForm.issueRoom.checkAll
                                 ? this.selectDataHouseTreeData.userID
                                 ? this.selectDataHouseTreeData.userID
                                 : this.selectDataPeopleTreeData.userList,
                                 : this.selectDataPeopleTreeData.userList,
-                            treeData: this.ruleForm.issueRoom.checkAll
-                                ? JSON.stringify(this.selectDataHouseTreeData.checkData)
-                                : JSON.stringify(this.selectDataPeopleTreeData.checkData),
+                            treeData: [],
                             title: this.ruleForm.title,
                             title: this.ruleForm.title,
                             type: this.ruleForm.informType,
                             type: this.ruleForm.informType,
                             urgentFlag: this.ruleForm.exigencyOr == '是' ? 1 : 0,
                             urgentFlag: this.ruleForm.exigencyOr == '是' ? 1 : 0,

+ 2 - 1
operationSupport/src/views/workbench/index.vue

@@ -251,7 +251,8 @@ export default {
         getInformData() {
         getInformData() {
             this.$http.get('/sc-community-web/Workbench/getNoticeInfo').then((res) => {
             this.$http.get('/sc-community-web/Workbench/getNoticeInfo').then((res) => {
                 if (res.status == 0) {
                 if (res.status == 0) {
-                    this.informData = res.data;
+                    let data = res.data;
+                    this.informData = data;
                 } else {
                 } else {
                     this.$message.warning('获取通知信息失败');
                     this.$message.warning('获取通知信息失败');
                 }
                 }

+ 0 - 1
operationSupport/src/views/workbench/style.scss

@@ -227,7 +227,6 @@
             width: 467px;
             width: 467px;
             height: 17px;
             height: 17px;
             overflow: hidden;
             overflow: hidden;
-            white-space: nowrap;
             text-overflow: ellipsis;
             text-overflow: ellipsis;
         }
         }
         /deep/ img {
         /deep/ img {