合并

CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml

@@ -6,7 +6,7 @@
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="activity_title" property="activityTitle" jdbcType="VARCHAR" />
     <result column="activity_carousel_img" property="activityCarouselImg" jdbcType="VARCHAR" />
-    <result column="activity_content" property="activityContent" jdbcType="VARCHAR" />
+    <result column="activity_content" property="activityContent" jdbcType="LONGVARCHAR" />
     <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="sort" property="sort" jdbcType="INTEGER" />
     <result column="sign_up_count" property="signUpCount" jdbcType="INTEGER" />
@@ -47,7 +47,7 @@
       status, create_user, create_date, 
       update_user, update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityTitle,jdbcType=VARCHAR}, 
-      #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=LONGVARCHAR}, #{sort,jdbcType=INTEGER},
       #{signUpCount,jdbcType=INTEGER}, #{signUpMax,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, 
       #{registrationStartTime,jdbcType=TIMESTAMP}, #{registrationEndTime,jdbcType=TIMESTAMP}, 
       #{activityStartTime,jdbcType=TIMESTAMP}, #{activityEndTime,jdbcType=TIMESTAMP}, 
@@ -126,7 +126,7 @@
         #{activityCarouselImg,jdbcType=VARCHAR},
       </if>
       <if test="activityContent != null" >
-        #{activityContent,jdbcType=VARCHAR},
+        #{activityContent,jdbcType=LONGVARCHAR},
       </if>
       <if test="sort != null" >
         #{sort,jdbcType=INTEGER},
@@ -182,7 +182,7 @@
         activity_carousel_img = #{activityCarouselImg,jdbcType=VARCHAR},
       </if>
       <if test="activityContent != null" >
-        activity_content = #{activityContent,jdbcType=VARCHAR},
+        activity_content = #{activityContent,jdbcType=LONGVARCHAR},
       </if>
       <if test="sort != null" >
         sort = #{sort,jdbcType=INTEGER},
@@ -231,7 +231,7 @@
     set community_id = #{communityId,jdbcType=INTEGER},
       activity_title = #{activityTitle,jdbcType=VARCHAR},
       activity_carousel_img = #{activityCarouselImg,jdbcType=VARCHAR},
-      activity_content = #{activityContent,jdbcType=VARCHAR},
+      activity_content = #{activityContent,jdbcType=LONGVARCHAR},
       sort = #{sort,jdbcType=INTEGER},
       sign_up_count = #{signUpCount,jdbcType=INTEGER},
       sign_up_max = #{signUpMax,jdbcType=INTEGER},

CODE/smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml

@@ -6,7 +6,7 @@
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="announcement_title" property="announcementTitle" jdbcType="VARCHAR" />
     <result column="announcement_carousel_img" property="announcementCarouselImg" jdbcType="VARCHAR" />
-    <result column="announcement_content" property="announcementContent" jdbcType="VARCHAR" />
+    <result column="announcement_content" property="announcementContent" jdbcType="LONGVARCHAR" />
     <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="sort" property="sort" jdbcType="INTEGER" />
     <result column="view_count" property="viewCount" jdbcType="INTEGER" />
@@ -143,7 +143,7 @@
     set community_id = #{communityId,jdbcType=INTEGER},
       announcement_title = #{announcementTitle,jdbcType=VARCHAR},
       announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
-      announcement_content = #{announcementContent,jdbcType=VARCHAR},
+      announcement_content = #{announcementContent,jdbcType=LONGVARCHAR},
       sort = #{sort,jdbcType=INTEGER},
       view_count = #{viewCount,jdbcType=INTEGER},
       set_up_carousel = #{setUpCarousel,jdbcType=CHAR},

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -340,28 +340,6 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         }
 
         int row = tpActivityMapper.updateById(selectTpActivity);
-
-        // 先将原图删除!
-         QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
-         queryWrapper.eq("uuid", tpActivity.getId());
-         queryWrapper.eq("type", "activity");
-         tdImagesMapper.delete(queryWrapper);
-
-        if (radio==1){
-
-//                InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(), tpActivity.getId()+"");
-//                String codeUrl= imageServiceI.getImageUrl(inputStream);
-                TdImages tdImages= new TdImages();
-                tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
-                tdImages.setUuid(tpActivity.getId());
-                tdImages.setType("activityCode");
-                tdImages.setCreateUser(userElement.getId());
-                tdImages.setCreateTime(LocalDateTime.now());
-                tdImagesMapper.insert(tdImages);
-
-        }
-
-
         // 插入图片
         insertImg(contentImgArray, userElement, tpActivity);
 

CODE/smart-community/property-api/src/main/resources/mapper/TpAnnouncementMapper.xml

@@ -46,7 +46,7 @@
         announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
       </if>
       <if test="announcementContent != null" >
-        announcement_content = #{announcementContent,jdbcType=VARCHAR},
+        announcement_content = #{announcementContent,jdbcType=LONGVARCHAR},
       </if>
       <if test="sort != null" >
         sort = #{sort,jdbcType=INTEGER},

CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseMapper.xml

@@ -39,6 +39,6 @@
         <if test="tpRentalHouse.endPrice != null and tpRentalHouse.endPrice != ''">
             and t.rental_price  &lt;= #{tpRentalHouse.endPrice,jdbcType=INTEGER}
         </if>
-        order by t.sort, t.update_date desc
+        order by t.sort desc, t.update_date desc
     </select>
 </mapper>

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -349,10 +349,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      // var hour = value.getHours()
-      // var minutes = value.getMinutes()
-      // var seconds = value.getSeconds()
-      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
     handleSizeChange(val) {

VUECODE/smart-property-manage/src/views/bill/license/index.vue

@@ -71,7 +71,7 @@
         prop="expireDate"
         align="center"
         label="延期后到期日">
-        <template slot-scope="scope">{{ formatDate(scope.row.expireDate) }}</template>
+        <template slot-scope="scope">{{ formatDateTime(scope.row.expireDate) }}</template>
       </el-table-column>
       <el-table-column
         prop="orderStatus"

VUECODE/smart-property-manage/src/views/building/audit/index.vue

@@ -215,10 +215,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      // var hour = value.getHours()
-      // var minutes = value.getMinutes()
-      // var seconds = value.getSeconds()
-      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     }
   }

VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue

@@ -13,6 +13,7 @@
       lazy
       show-checkbox
       node-key="id"
+
       :expand-on-click-node="false"
       :render-content="renderContent">
     </el-tree>

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
-      <el-form-item label="楼盘库">
+      <el-form-item label="">
         <el-select v-model="listQuery.phaseId" style="width: 120px;" placeholder="期/区" @change="buildSelectChange(0)" >
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
@@ -366,10 +366,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      // var hour = value.getHours()
-      // var minutes = value.getMinutes()
-      // var seconds = value.getSeconds()
-      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
     showRoleName(roleId) {

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -22,9 +22,9 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <div><span style="position:relative;top:-100px">活动详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等" style="width: 80%;"/></div>
-      </el-form-item>
-      <el-form-item>
+        <div>活动详细描述&nbsp;&nbsp;<wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
+      </el-form-item> 
+      <!-- <el-form-item>
         <div >
           <div style="transform:translateY(250%);">活动配图</div>
         <div  style="width: 500px;padding-left:13%;">
@@ -42,7 +42,7 @@
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="signUpMax">
         <div style="display: flex;">
           <span style="width: 140px;">报名人数上限</span>
@@ -81,8 +81,10 @@
 </template>
 
 <script>
+import Wangeditor from '@/components/Wangeditor'
 export default {
   name: 'Index',
+  components: { Wangeditor },
   data() {
     return {
       ruleForm: {
@@ -158,22 +160,22 @@ export default {
       // }
       // return isJPG && isLt2M
     },
-    handleRemove(file, fileList) { // 活动配图移除时
-      this.ruleForm.contentImg = []
-      for (let i = 0; i < fileList.length; i++) {
-        this.ruleForm.contentImg.push(fileList[i].response.data[0])
-      }
-      console.log(file, fileList)
-    },
-    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
-      const resImg = response.data[0]
-      this.ruleForm.contentImg.push(resImg)
-      console.log('上传活动配图成功时回调!')
-    },
+    // handleRemove(file, fileList) { // 活动配图移除时
+    //   this.ruleForm.contentImg = []
+    //   for (let i = 0; i < fileList.length; i++) {
+    //     this.ruleForm.contentImg.push(fileList[i].response.data[0])
+    //   }
+    //   console.log(file, fileList)
+    // },
+    // handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+    //   this.dialogImageUrl = file.url
+    //   this.dialogVisible = true
+    // },
+    // handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+    //   const resImg = response.data[0]
+    //   this.ruleForm.contentImg.push(resImg)
+    //   console.log('上传活动配图成功时回调!')
+    // },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
       console.log(value)
@@ -211,6 +213,11 @@ export default {
       }).catch(() => {
         console.log('error AddActivity')
       })
+    },
+    // 富文本
+    wangeditorValue(value) {
+    this.ruleForm.activityContent = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    // this.ss(value)
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -13,7 +13,7 @@
           :on-success="handleAvatarSuccess"
           :before-upload="beforeAvatarUpload"
           class="avatar-uploader"
-          :name="uploadFiles"
+          name="uploadFiles"
           :action="uploadImgUrl">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
@@ -21,10 +21,10 @@
         </div>
         </div>
       </el-form-item>
-      <el-form-item >
-        <div><span style="position:relative;top:-100px">活动详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等" style="width: 80%;"/></div>
+      <el-form-item>
+        <div>活动详细描述&nbsp;&nbsp;<wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
       </el-form-item>
-      <el-form-item >
+      <!-- <el-form-item >
         <div >
           <div style="transform:translateY(250%);">公告轮播图</div>
         <div  style="width: 500px;padding-left:13%;">
@@ -43,7 +43,7 @@
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="signUpMax">
         <div style="display: flex;">
           <span style="width: 140px;">报名人数上限</span>
@@ -81,9 +81,10 @@
 </template>
 
 <script>
-
+import Wangeditor from '@/components/Wangeditor'
 export default {
   name: 'Index',
+  components: { Wangeditor },
   data() {
     return {
       ruleForm: {
@@ -183,23 +184,23 @@ export default {
       // }
       // return isJPG && isLt2M
     },
-    handleRemove(file, fileList) { // 活动配图移除时
-      console.log(file, fileList)
-      this.ruleForm.contentImg = []
-      for (let i = 0; i < fileList.length; i++) {
-        this.ruleForm.contentImg.push(fileList[i].url)
-      }
+    // handleRemove(file, fileList) { // 活动配图移除时
+    //   console.log(file, fileList)
+    //   this.ruleForm.contentImg = []
+    //   for (let i = 0; i < fileList.length; i++) {
+    //     this.ruleForm.contentImg.push(fileList[i].url)
+    //   }
 
-    },
-    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
-      const resImg = response.data[0]
-      this.ruleForm.contentImg.push(resImg)
-      console.log('上传活动配图成功时回调!')
-    },
+    // },
+    // handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+    //   this.dialogImageUrl = file.url
+    //   this.dialogVisible = true
+    // },
+    // handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+    //   const resImg = response.data[0]
+    //   this.ruleForm.contentImg.push(resImg)
+    //   console.log('上传活动配图成功时回调!')
+    // },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
       console.log(value)
@@ -212,12 +213,16 @@ export default {
 
         const imgArr = resData.contentImg
         this.ruleForm.contentImg = imgArr
-        for (let i = 0; i < imgArr.length; i++) {
-          this.activityContentList.push({ url: imgArr[i] })
-        }
+        // for (let i = 0; i < imgArr.length; i++) {
+        //   this.activityContentList.push({ url: imgArr[i] })
+        // }
       })
-    }
-
+    },
+    // 富文本
+    wangeditorValue(value) {
+    this.ruleForm.activityContent = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    this.ss(value)
+    },
   }
 }
 </script>

VUECODE/smart-property-manage/src/views/social/activity/index.vue

@@ -193,10 +193,10 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
-      // var hour = value.getHours()
-      // var minutes = value.getMinutes()
-      // var seconds = value.getSeconds()
-      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
     getStatus(row) { // 获取状态

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -7,23 +7,21 @@
     <img :src="ruleForm.activityCarouselImg" width="100" height="100">
     </div>
     </div>
-    <div class="activityContext">
-      <div class="activityTile"><span style="position:relative;top:-1px">活动详细描述&nbsp;&nbsp;</span>{{ ruleForm.activityContent }}</div>
-    </div>
-    <div>
+    <div>活动详细描述&nbsp;&nbsp;<wangeditor :content="ruleForm.activityContent"/></div>
+    <!-- <div>
         <div>
         <div style="transform:translateY(20%);">活动配图</div>
         <div  style="width: 500px;padding-left:20%;">
       <img v-for="item in ruleForm.contentImg" :src="item" width="80" height="80" />
         </div>
         </div>
-    </div>
+    </div> -->
     <span>
     <div style="display: flex;">
-          <span class="activityTile" style="width: 200px;transform:translateY(50%);">是否需要报名人扫码签到</span>
-          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(50%);">需要</el-radio>
-          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(50%);">不需要</el-radio> 
-          <span style="padding-left:20%"><el-button type="primary" style="float:left;" @click="singn">查看签到名单</el-button></span> 
+          <span class="activityTile" style="width: 200px;transform:translateY(70%);">是否需要报名人扫码签到</span>
+          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(70%);">需要</el-radio>
+          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(70%);">不需要</el-radio> 
+          <span style="padding-left:20%"><el-button type="primary" style="float:left;transform:translateY(30%)" @click="singn">查看签到名单</el-button></span> 
     </div>
     <div style="padding-left:30%;" v-if="ruleForm.activityCode !=null">
         <div><img :src="qrcode" width="200" height="200" ></div>
@@ -50,10 +48,11 @@
 
 <script>
 import html2canvas from 'html2canvas';
-import QRCode from 'qrcode'
-
+import QRCode from 'qrcode';
+import Wangeditor from '@/components/Wangeditor';
 export default {
   name: 'Index',
+  components: { Wangeditor },
   data() {
     return {
       asOfdate: '2018/10/10 23:59:59',

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -2,8 +2,7 @@
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="50px" class="ruleForm">
       <el-form-item  prop="announcementTitle">
-        <div>公告标题&nbsp;&nbsp;<el-input v-model="ruleForm.announcementTitle" placeholder="20字以内"  style="width: 80%;padding-left:3.5%;"/></div>
-        
+        <div>公告标题&nbsp;&nbsp;<el-input v-model="ruleForm.announcementTitle" placeholder="20字以内"  style="width: 80%;padding-left:3.5%;"/></div>    
       </el-form-item>
       <el-form-item  prop="announcementCarouselImg" >
         <div >
@@ -22,11 +21,14 @@
           </div>
         </div>
       </el-form-item>
-      <el-form-item label="">
-        
-        <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
+      <el-form-item label="" prop="announcementContent">     
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div>公告内容<span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item label="">
+        <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
+      </el-form-item> -->
+      <!-- <el-form-item>
          <div >
           <div style="transform:translateY(250%);">公告配图</div>
         <div  style="width: 500px;padding-left:13%;">
@@ -44,7 +46,7 @@
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item  prop="sort">
         <div>权重值&nbsp;&nbsp;<el-input-number  v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
         
@@ -58,8 +60,10 @@
 </template>
 
 <script>
+import Wangeditor from '@/components/Wangeditor'
 export default {
   name: 'Index',
+  components: { Wangeditor },
   data() {
     return {
       ruleForm: {
@@ -79,7 +83,7 @@ export default {
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '公告详细描述', trigger: 'blur' }
+          { required: false, message: '公告内容描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
@@ -104,11 +108,16 @@ export default {
             this.$message.error('轮播图未上传')
             return    
           }
-          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
-            return
-          }
+          // if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+          //   this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
+          //   return
+          // }
           this.ruleForm.status = status // 发布状态
+         if(this.ruleForm.announcementContent === '<p><br></p>'){
+             this.$message.error('公告内容描述不能为空!')
+             loading.close()
+             return
+          }
           this.$store.dispatch('AddAnnouncement', this.ruleForm).then((res) => {
             if (res.code === '0') {
               this.$message({
@@ -153,20 +162,25 @@ export default {
       // }
       // return isJPG && isLt2M
     },
-    handleRemove(file, fileList) { // 活动配图移除时
-      this.ruleForm.contentImg = []
-      for (let i = 0; i < fileList.length; i++) {
-        this.ruleForm.contentImg.push(fileList[i].response.data[0])
-      }
-      console.log(file, fileList)
-    },
-    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
-      const resImg = response.data[0]
-      this.ruleForm.contentImg.push(resImg)
+    // handleRemove(file, fileList) { // 活动配图移除时
+    //   this.ruleForm.contentImg = []
+    //   for (let i = 0; i < fileList.length; i++) {
+    //     this.ruleForm.contentImg.push(fileList[i].response.data[0])
+    //   }
+    //   console.log(file, fileList)
+    // },
+    // handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+    //   this.dialogImageUrl = file.url
+    //   this.dialogVisible = true
+    // },
+    // handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+    //   const resImg = response.data[0]
+    //   this.ruleForm.contentImg.push(resImg)
+    // },
+
+    // 富文本
+    wangeditorValue(value) {
+      this.ruleForm.announcementContent = value // 在这里接受子组件传过来的参数，赋值给data里的参数
     },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value

VUECODE/smart-property-manage/src/views/social/announcement/details.vue

@@ -6,17 +6,16 @@
       </el-form-item>
       <el-form-item label="公告轮播图">
         <span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
+        <br>
         <img :src="ruleForm.announcementCarouselImg" width="100" height="100">
       </el-form-item>
       <el-form-item label="公告详细内容">
         <div class="activityContext">
-          {{ ruleForm.announcementContent }}
+         <span id="father"><wangeditor :content="ruleForm.announcementContent" style="height:380px;"/></span>
         </div>
       </el-form-item>
-      <el-form-item label="公告配图">
-        <template v-for="site in ruleForm.contentImg">
-          <img :src="site.url" width="100" height="100" >
-        </template>
+      <el-form-item label="权重值" prop="sort">
+        <div><el-input-number v-model="ruleForm.sort" label="权重值"/></div>
       </el-form-item>
     </el-form>
     <div class="bom-button">
@@ -26,8 +25,10 @@
 </template>
 
 <script>
+import Wangeditor from '@/components/Wangeditor'
 export default {
   name: 'Index',
+  components: { Wangeditor },
   data() {
     return {
       asOfdate: '2018/10/10 23:59:59',
@@ -88,7 +89,7 @@ export default {
 #root {
   display: flex;
   flex-flow: column;
-  width: 500px;
+  width: 600px;
   margin-top: 50px;
   margin-left: auto;
   margin-right: auto;
@@ -152,7 +153,7 @@ export default {
 .bom-button{
   display: flex;
   justify-content: center;
-  margin-top: 20px;
+  margin-top: -20px;
   margin-bottom: 100px;
 }
 </style>

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -21,10 +21,14 @@
         </div>
         </div>
       </el-form-item>
-      <el-form-item >
-        <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
+      <el-form-item label="" prop="announcementContent">     
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div>公告内容<span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
       </el-form-item>
-      <el-form-item >
+      <!-- <el-form-item >
+        <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
+      </el-form-item> -->
+      <!-- <el-form-item >
        <div >
           <div style="transform:translateY(250%);">公告轮播图</div>
         <div  style="width: 500px;padding-left:13%;">
@@ -43,7 +47,7 @@
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item  prop="sort">
         <div>权重值&nbsp;&nbsp;<el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
       </el-form-item>
@@ -53,10 +57,11 @@
     </el-form>
   </div>
 </template>
-
 <script>
+import Wangeditor from '@/components/Wangeditor'
 export default {
   name: 'Index',
+  components: { Wangeditor },
   data() {
     return {
       ruleForm: {
@@ -78,7 +83,7 @@ export default {
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '公告详细描述', trigger: 'blur' }
+          { required: true, message: '公告内容描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
@@ -102,12 +107,12 @@ export default {
       })
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
-            loading.close()
-            return
-          }
           this.ruleForm.status = status // 发布状态
+          if(this.ruleForm.announcementContent === '<p><br></p>'){
+             this.$message.error('公告内容描述不能为空!')
+             loading.close()
+             return
+          }
           this.$store.dispatch('Updateannouncement', this.ruleForm).then((res) => {
             if (res.code === '0') {
               this.$message({
@@ -148,22 +153,22 @@ export default {
       // }
       // return isJPG && isLt2M
     },
-    handleRemove(file, fileList) { // 活动配图移除时
-      this.ruleForm.contentImg = []
-      for (let i = 0; i < fileList.length; i++) {
-        this.ruleForm.contentImg.push(fileList[i].url)
-      }
-      console.log(file, fileList)
-    },
-    handlePictureCardPreview(file) { // 点击公告配图文件列表中已上传的文件时的钩子
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
-      const resImg = response.data[0]
-      this.ruleForm.contentImg.push(resImg)
-      console.log('上传活动配图成功时回调!')
-    },
+    // handleRemove(file, fileList) { // 活动配图移除时
+    //   this.ruleForm.contentImg = []
+    //   for (let i = 0; i < fileList.length; i++) {
+    //     this.ruleForm.contentImg.push(fileList[i].url)
+    //   }
+    //   console.log(file, fileList)
+    // },
+    // handlePictureCardPreview(file) { // 点击公告配图文件列表中已上传的文件时的钩子
+    //   this.dialogImageUrl = file.url
+    //   this.dialogVisible = true
+    // },
+    // handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+    //   const resImg = response.data[0]
+    //   this.ruleForm.contentImg.push(resImg)
+    //   console.log('上传活动配图成功时回调!')
+    // },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
     },
@@ -175,13 +180,12 @@ export default {
         this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent// 内容
         this.Urlimage = resData.tpAnnouncement.announcementCarouselImg // 轮播图
         this.ruleForm.sort = resData.tpAnnouncement.sort// 权重
-        // 多张图片进行遍历
-        for (let i = 0; i < resData.studentList.length; i++) {
-          this.contentImgList.push({ url: resData.studentList[i].imageUrl })
-          this.ruleForm.contentImg.push(resData.studentList[i].imageUrl)
-        }
       })
-    }
+    },
+    // 富文本
+    wangeditorValue(value) {
+    this.ruleForm.announcementContent = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
   }
 }
 </script>

VUECODE/smart-property-manage/src/views/social/announcement/index.vue

@@ -238,8 +238,12 @@ export default {
       var year = value.getFullYear()
       var month = value.getMonth() + 1
       var day = value.getDate()
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
-    }
+    },
   }
 }
 </script>

VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue

@@ -20,8 +20,8 @@
       </el-form-item>
       <el-form-item>
         <div >
-          <div style="transform:translateY(250%);">话题配图</div>
-        <div  style="width: 500px;padding-left:13%;">
+        <span>话题配图</span>
+        <div  style="padding-left:13%;transform:translateY(-20%);">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"

VUECODE/smart-property-manage/src/views/social/transaction/transactionEdit.vue

@@ -21,8 +21,8 @@
       </el-form-item>
       <el-form-item>
         <div >
-          <div style="transform:translateY(250%);">话题配图</div>
-        <div  style="width: 500px;padding-left:13%;">
+          <div>话题配图</div>
+        <div  style="padding-left:13%;transform:translateY(-20%);">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"