物业管理bug修改添加插槽，修改图片内容大小

operationSupport/src/components/Tinymce/index.vue

@@ -277,4 +277,10 @@ export default {
 ::v-deep #mceu_28-body {
     display: none !important;
 }
+/deep/ .cell,
+.el-tooltip {
+    &:hover {
+        display: none;
+    }
+}
 </style>

operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -38,12 +38,6 @@
                 </div>
                 <div class="prev-text-none" v-else>暂无图片</div>
             </div>
-            <div class="prev-text html-content">
-                <div class="html-left">通知内容:</div>
-                <div class="html-right">
-                    <div v-html="dataDetail.content"></div>
-                </div>
-            </div>
             <div class="prev-text files">
                 <div>文件上传:</div>
                 <div v-if="filePath.length > 0" class="files-content">
@@ -51,7 +45,15 @@
                         <div class="prev-text-right"><i class="el-icon-paperclip"></i> {{ item.name }}</div>
                     </div>
                 </div>
-                <div class="prev-text-none" v-else>暂无文件</div>
+                <div class="prev-text-none" v-else style="margin-left: 25px">暂无文件</div>
+            </div>
+            <div class="prev-text html-content">
+                <div class="html-left">通知内容:</div>
+                <GeminiScrollbar class="my-scroll-bar" :autoshow="true">
+                    <!-- <div class="html-right"> -->
+                    <div v-html="dataDetail.content"></div>
+                    <!-- </div> -->
+                </GeminiScrollbar>
             </div>
         </div>
     </div>
@@ -195,7 +197,6 @@ export default {
     }
     .prev-text-none {
         font-size: 12px;
-        margin-left: 25px;
     }
     .image-content {
         width: 100%;
@@ -244,11 +245,28 @@ export default {
     .html-content {
         display: flex;
         width: 100%;
+        max-height: 200px;
         .html-left {
             margin-right: 5%;
         }
+
         .html-right {
-            width: 86%;
+            // width: 86%;
+            // max-height: 218px;
+            // overflow-y: scroll;
+            // overflow-x: hidden;
+        }
+    }
+    // 弹框自定义滚动条
+    .my-scroll-bar {
+        width: 86%;
+        height: 200px;
+        max-height: 218px;
+        /deep/ .gm-scrollbar.-horizontal .thumb {
+            height: 0;
+        }
+        /deep/ .gm-scroll-view {
+            // height: 0 !important;
         }
     }
 }

operationSupport/src/views/propertyManagement/index.vue

@@ -8,7 +8,7 @@
                 clearable
                 v-model="mixins_query.content"
             ></el-input>
-            <el-select placeholder="请选择所属地区" v-model="mixins_query.communityId" clearable>
+            <el-select placeholder="请选择所属社区" v-model="mixins_query.communityId" clearable>
                 <el-option v-for="(item, index) in communityList" :key="index" :label="item.label" :value="item.id"></el-option>
             </el-select>
             <el-select placeholder="请选择投诉类型" v-model="mixins_query.type" clearable>
@@ -45,6 +45,9 @@
                     @page-change="pageChange"
                     :loading="mixins_onQuery"
                 >
+                    <template slot-scope="scope" slot="content">
+                        <div>{{ scope.row.content }}</div>
+                    </template>
                     <template slot-scope="scope" slot="house">
                         <!-- <div>{{ scope.row.unitName }}{{ roomNumber }}</div> -->
                         <div>{{ scope.row.communityName }}{{ scope.row.unitName }}{{ scope.row.roomNumber }}</div>
@@ -306,7 +309,8 @@ export default {
                 },
                 {
                     label: '内容',
-                    prop: 'content'
+                    prop: 'content',
+                    slot: 'content'
                 },
                 {
                     label: '状态',

operationSupport/src/views/propertyManagement/inform.vue

@@ -30,6 +30,9 @@
                     @page-change="pageChange"
                     :loading="mixins_onQuery"
                 >
+                    <template slot="pubPeople" slot-scope="scope">
+                        {{ scope.row.pubPeople }}
+                    </template>
                     <template slot-scope="scope" slot="releaseTime">
                         <div>
                             {{ scope.row.pubDate }}
@@ -188,10 +191,10 @@
                                                 ></up-image>
                                             </div>
                                         </el-form-item>
-                                        <el-form-item label="通知内容" prop="informContent">
+                                        <el-form-item label="通知内容" prop="editorContents">
                                             <!-- tinymce-editor 富文本编辑器   -->
                                             <div class="editor-container">
-                                                <tinymce v-model="editorContent" ref="endit" :height="150" />
+                                                <tinymce v-model="ruleForm.editorContents" ref="endit" :height="150" />
                                             </div>
                                         </el-form-item>
                                         <el-form-item label="文件上传" prop="fill">
@@ -246,20 +249,21 @@
                                     <div v-else>{{ rowDetail.type == 0 ? '物业通知' : '社区活动' }}</div>
                                 </div>
                                 <div class="center-padding"></div>
-                                <GeminiScrollbar class="my-scroll-bar" :autoshow="false" :color="red">
+                                <GeminiScrollbar class="my-scroll-bar" :autoshow="false">
                                     <div class="dialog-right-content">
                                         <div class="dialog-title">
                                             <div class="dialog-titles">
                                                 {{ rowDetail.title ? rowDetail.title : '标题' }}
                                             </div>
-                                            <div class="dialog-urgency" v-if="ruleForm.exigencyText">紧急</div>
+                                            <div class="dialog-urgency" v-if="rowDetail.urgentFlag">紧急</div>
+                                            <!-- ruleForm.exigencyOr -->
                                         </div>
                                         <div class="dialog-right-time" v-if="showDetail">{{ rowDetail.pubDate }}</div>
                                         <div class="dialog-right-time" v-else>{{ new Date() | filterTime }}</div>
                                         <div></div>
                                         <div class="content">
                                             <div class="content-text" v-if="showDetail">
-                                                <div v-html="editorContent" id="content" />
+                                                <div v-html="ruleForm.editorContents" id="content" />
                                             </div>
                                             <div class="content-text" v-else>
                                                 <div v-html="contentHtml" id="content" />
@@ -305,14 +309,7 @@ import previeInform from './common/previeInform';
 import upImage from './common/upImage';
 // Tinymce 富文本编辑器
 import Tinymce from '@/components/Tinymce';
-const content = ` <div>
-                         &nbsp;&nbsp;您好！为了给大家提供一个舒适、卫生的生活环境，进一步有效控制小区“四害”孳生，减少四害对大家生活影响，管理处计划12月份安排小区公共区域集中消杀4次。
-                         <div style="text-align: end; margin-right: 10px; color: #e0e1e3">
-                             <div style="margin-right: 30px">xxx物业管理处</div>
-                             <div>2022-02-22 02：02：02</div>
-                             <div>物业电话：13123123123</div>
-                         </div>
-                     </div>`;
+const content = '';
 export default {
     mixins: [list],
     components: { previeInform, Tinymce, upImage },
@@ -330,17 +327,8 @@ export default {
             // 显示详情
             showDetail: true,
             rowDetail: '',
-            // 富文本编辑器
-            editorContent: content,
             contentHtml: '',
-            contents: ` <div>
-                         &nbsp;&nbsp;您好！为了给大家提供一个舒适、卫生的生活环境，进一步有效控制小区“四害”孳生，减少四害对大家生活影响，管理处计划12月份安排小区公共区域集中消杀4次。
-                         <div style="text-align: end; margin-right: 10px; color: #e0e1e3">
-                             <div style="margin-right: 30px">xxx物业管理处</div>
-                             <div>2022-02-22 02：02：02</div>
-                             <div>物业电话：13123123123</div>
-                         </div>
-                     </div>`,
+            contents: '',
             // 查询的时间
             searchTime: [],
             // 添加弹框信息
@@ -360,7 +348,9 @@ export default {
                 exigencyOr: '是', //是否紧急
                 exigencyText: true,
                 activeTime: [],
-                informContent: content, //通知内容
+                editorContents: '',
+                // informContent: content, //通知内容
+                informContent: '', //通知内容
                 upload: '' // 文件上传
             },
             rules: {
@@ -371,7 +361,7 @@ export default {
                 exigencyOr: [{ required: true, message: '请选择是否紧急', trigger: 'change' }],
                 activeTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
                 issueRoom: [{ required: true, message: '请选择发布对象', trigger: 'change' }],
-                informContent: [{ required: true, message: '请选择内容', trigger: 'blur' }] //通知内容
+                editorContents: [{ required: true, message: '请发布内容', trigger: 'blur' }] //通知内容
             },
             // 输入地址
             location: '',
@@ -435,7 +425,8 @@ export default {
                 },
                 {
                     label: '发布人',
-                    prop: 'pubPeople'
+                    prop: 'pubPeople',
+                    slot: 'pubPeople'
                 },
                 {
                     label: '操作',
@@ -739,9 +730,6 @@ export default {
             if (type === 'prev') {
                 this.$refs['ruleForm'].validate((valid) => {
                     if (valid) {
-                        console.log('dialogButton');
-                        console.log('this.selectDataHouseTreeData', this.selectDataHouseTreeData);
-                        console.log('this.selectDataPeopleTreeData', this.selectDataPeopleTreeData);
                         if (
                             this.selectDataHouseTreeData.userList.length === 0 &&
                             this.selectDataPeopleTreeData &&
@@ -754,7 +742,7 @@ export default {
                         let endTime = this.$moment(this.ruleForm.activeTime[1]).format(`YYYY-MM-DDTHH:mm:ss`);
                         let query = {
                             communityId: this.ruleForm.popCommunityId,
-                            content: this.editorContent,
+                            content: this.ruleForm.editorContents,
                             startTime: startTime,
                             endTime: endTime,
                             filePath: JSON.stringify(this.uploadFileUrl),
@@ -780,7 +768,7 @@ export default {
                                 this.$message.success('发布成功');
                                 this.mixins_search();
                             } else {
-                                this.$message('发布失败,请重试');
+                                this.$message('系统繁忙,请稍后重试');
                                 this.successImageList = [];
                                 this.contentHtml = '';
                             }
@@ -795,13 +783,13 @@ export default {
             } else if (type == 'clear') {
                 this.centerDialogVisible = false;
                 this.clear();
-                this.$refs.upImages.clearImageList();
                 this.$refs['ruleForm'].resetFields();
+                this.$refs.upImages.clearImageList();
             } else {
                 this.centerDialogVisible = false;
                 this.clear();
-                this.$refs.upImages.clearImageList();
                 this.$refs['ruleForm'].resetFields();
+                this.$refs.upImages.clearImageList();
             }
         },
         /** 获取社区列表*/

operationSupport/src/views/propertyManagement/neighbor.vue

@@ -8,7 +8,7 @@
                 clearable
                 v-model="mixins_query.location"
             ></el-input>
-            <el-select placeholder="请选择所属地区" v-model="mixins_query.communityId" clearable>
+            <el-select placeholder="请选择所属社区" v-model="mixins_query.communityId" clearable>
                 <el-option v-for="(item, index) in communityList" :key="index" :label="item.label" :value="item.id"></el-option>
             </el-select>
             <el-date-picker

operationSupport/src/views/propertyManagement/phone.vue

@@ -2,7 +2,7 @@
     <div class="phone">
         <div class="search">
             <el-input placeholder="请输入管理处名称/电话" maxlength="11" class="search-input" clearable v-model="location"></el-input>
-            <el-select placeholder="请选择所属地区" v-model="mixins_query.communityId" clearable>
+            <el-select placeholder="请选择所属社区" v-model="mixins_query.communityId" clearable>
                 <el-option v-for="(item, index) in communityListCreate" :key="index" :label="item.label" :value="item.id"></el-option>
             </el-select>
             <el-button type="primary" placeholder="状态" class="search-btn" @click="searchInfo" icon="el-icon-search" v-preventReClick
@@ -194,6 +194,8 @@ export default {
         },
         /**查询按钮*/
         searchInfo() {
+            this.mixins_query.name = '';
+            this.mixins_query.telephone = '';
             if (this.location) {
                 if (isNaN(this.location)) {
                     this.mixins_query.name = this.location;

operationSupport/src/views/propertyManagement/style.scss

@@ -501,10 +501,11 @@ $fontSizeSmall: 14px;
                             .content-text {
                                 width: 100%;
                                 color: #686b78;
-                                text-indent: 2em;
                                 background-color: #fff;
                                 /deep/ img {
-                                    width: 100%;
+                                    // width: 100%;
+                                    max-width: 100%;
+                                    max-height: 750px;
                                 }
                             }
                             .content-inform {
@@ -578,6 +579,7 @@ $fontSizeSmall: 14px;
     margin-top: 10px;
     border: 1px solid #e0e1e3;
 }
+
 /deep/ .mce-container,
 .mce-container-body {
     background: #fafcff;
@@ -594,10 +596,16 @@ $fontSizeSmall: 14px;
 /deep/ #mceu_33 {
     display: none !important;
 }
+
 // #mceu_17 {
 //     display: none;
 // }
 
+s {
+    max-width: 200px;
+    max-height: 170px;
+}
+
 // 弹框自定义滚动条
 .my-scroll-bar {
     height: 438px;
@@ -649,6 +657,7 @@ $fontSizeSmall: 14px;
 // /deep/ .el-checkbox__inner {
 //     border-radius: 50% !important;
 // }
+
 // /deep/ .el-checkbox-group {
 //     display: flex;
 // }