weiximei 6 anos atrás
pai
commit
c03f77c36e

+ 1
- 1
CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpAnnouncementController.java Ver arquivo

@@ -38,7 +38,7 @@ public class TpAnnouncementController extends BaseController {
38 38
     @ApiOperation(value = "添加公告",nickname ="添加公告")
39 39
     @ApiImplicitParams({
40 40
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="announcementTitle:公告标题," +
41
-                    "announcementCarouselImg:轮播图,announcementContent:内容,announcementContentImg:内容图片,sort:权重值")})
41
+                    "announcementCarouselImg:轮播图,announcementContent:内容,contentImg:内容图片,sort:权重值")})
42 42
     @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
43 43
     @RequestMapping(value="/addAnnouncement",method = RequestMethod.POST)
44 44
     public ResponseBean addAnnouncement(@RequestBody String paramets, HttpSession session){

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

@@ -109,7 +109,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
109 109
         String [] contentImgArray = jsonArray.toArray(new String[]{});
110 110
         TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
111 111
 
112
-        if (contentImgArray.length <= 0 && (null == tpActivity.getActivityContent() || "".equals(tpActivity.getActivityContent()))) {
112
+        if (contentImgArray.length <= 0 && (null == tpActivity.getActivityContent() || "".equals(tpActivity.getActivityContent()))){
113 113
             responseBean.addError("活动内容描述 和 活动配图至少要存在一个!");
114 114
             return responseBean;
115 115
         }

+ 1
- 1
VUECODE/smart-property-manage/src/api/announcement.js Ver arquivo

@@ -21,8 +21,8 @@ export function addAnnouncement(data) {
21 21
     data: {
22 22
       announcementTitle: data.announcementTitle,
23 23
       announcementCarouselImg: data.announcementCarouselImg,
24
+      contentImg: data.contentImg,
24 25
       announcementContent: data.announcementContent,
25
-      announcementContentImg: data.announcementContentImg,
26 26
       sort: data.sort
27 27
     }
28 28
   })

+ 6
- 1
VUECODE/smart-property-manage/src/views/owner/index.vue Ver arquivo

@@ -39,7 +39,11 @@
39 39
       <el-table-column prop="idCard" label="身份证号" align="center" />
40 40
       <!-- <el-table-column prop="name" label="所在户" width="180" /> -->
41 41
       <el-table-column label="所在户" align="center">
42
-        <template slot-scope="scope">{{ scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}</template>
42
+        <template slot-scope="scope">
43
+          <span v-if="scope.row.building!==null&&scope.row.unit!==null&&scope.row.level!==null&&scope.row.roomNo!==null&&scope.row.phase!==null">
44
+          {{ scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo+scope.row.phase }}
45
+          </span>
46
+          </template>
43 47
       </el-table-column>
44 48
       <!-- <el-table-column prop="createDate" label="创建时间" width="540" align="center" /> -->
45 49
       <el-table-column label="创建时间" align="center">
@@ -75,6 +79,7 @@ export default {
75 79
     return {
76 80
       listQuery: {
77 81
         building: '',
82
+        phase: '',
78 83
         unit: '',
79 84
         ownerTel: '',
80 85
         idCard: '',

+ 19
- 17
VUECODE/smart-property-manage/src/views/social/announcement/add.vue Ver arquivo

@@ -1,10 +1,10 @@
1 1
 <template>
2 2
   <div id="root">
3 3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
4
-      <el-form-item label="活动标题" prop="activityTitle">
5
-        <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
4
+      <el-form-item label="活动标题" prop="announcementTitle">
5
+        <el-input v-model="ruleForm.announcementTitle" placeholder="15字以内"/>
6 6
       </el-form-item>
7
-      <el-form-item label="活动轮播图" prop="activityCarouselImg">
7
+      <el-form-item label="活动轮播图" prop="announcementCarouselImg">
8 8
         <el-upload
9 9
           :show-file-list="false"
10 10
           :on-success="handleAvatarSuccess"
@@ -30,7 +30,7 @@
30 30
           <i class="el-icon-plus"/>
31 31
         </el-upload>
32 32
         <el-dialog :visible.sync="dialogVisible">
33
-          <img :src="announcementContentImg" width="100%" alt="">
33
+          <img :src="dialogImageUrl" width="100%" alt="">
34 34
         </el-dialog>
35 35
       </el-form-item>
36 36
       <el-form-item label="权重值" prop="sort">
@@ -52,14 +52,16 @@ export default {
52 52
       ruleForm: {
53 53
         announcementTitle: '',
54 54
         announcementCarouselImg: '', // 轮播图
55
-        announcementContent: '', // 公告内容详细
56
-        announcementContentImg: [], // 公告内容配图
55
+        announcementContent: '', // 内容详细
56
+        contentImg: [], // 内容配图
57 57
         sort: 1, // 权重
58 58
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
59 59
       },
60 60
       imageUrl: '', // 轮播图预览
61
+      dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
62
+      dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
61 63
       rules: {
62
-        activityTitle: [
64
+        announcementTitle: [
63 65
           { required: true, message: '请输入活动名称', trigger: 'blur' },
64 66
           { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
65 67
         ],
@@ -83,18 +85,18 @@ export default {
83 85
       })
84 86
       this.$refs[formName].validate((valid) => {
85 87
         if (valid) {
86
-          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.announcementContentImg.length <= 0) {
88
+          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
87 89
             this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
88 90
             return false
89 91
           }
90 92
           this.ruleForm.status = 1 // 发布状态
91
-          this.$store.dispatch('AddActivity', this.ruleForm).then((res) => {
93
+          this.$store.dispatch('AddAnnouncement', this.ruleForm).then((res) => {
92 94
             if (res.code === '0') {
93 95
               this.$message({
94 96
                 message: res.message,
95 97
                 type: 'success'
96 98
               })
97
-              this.$router.push({ name: 'activity-index' })
99
+              this.$router.push({ name: 'announcement-index' })
98 100
               loading.close()
99 101
               return
100 102
             }
@@ -114,7 +116,7 @@ export default {
114 116
       this.$refs[formName].resetFields()
115 117
     },
116 118
     handleAvatarSuccess(res, file) { // 轮播图上传回调
117
-      this.ruleForm.activityCarouselImg = res.data[0]
119
+      this.ruleForm.announcementCarouselImg = res.data[0]
118 120
       this.imageUrl = URL.createObjectURL(file.raw)
119 121
     },
120 122
     beforeAvatarUpload(file) { // 轮播图上传前操作
@@ -129,20 +131,20 @@ export default {
129 131
       // }
130 132
       // return isJPG && isLt2M
131 133
     },
132
-    handleRemove(file, fileList) { // 配图移除时
133
-      this.ruleForm.announcementContentImg = []
134
+    handleRemove(file, fileList) { // 活动配图移除时
135
+      this.ruleForm.contentImg = []
134 136
       for (let i = 0; i < fileList.length; i++) {
135
-        this.ruleForm.announcementContentImg.push(fileList[i].response.data[0])
137
+        this.ruleForm.contentImg.push(fileList[i].response.data[0])
136 138
       }
137 139
       console.log(file, fileList)
138 140
     },
139
-    handlePictureCardPreview(file) { // 配图文件列表中已上传的文件时的钩子
140
-      this.announcementContentImg = file.url
141
+    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
142
+      this.dialogImageUrl = file.url
141 143
       this.dialogVisible = true
142 144
     },
143 145
     handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
144 146
       const resImg = response.data[0]
145
-      this.ruleForm.announcementContentImg.push(resImg)
147
+      this.ruleForm.contentImg.push(resImg)
146 148
       console.log('上传活动配图成功时回调!')
147 149
     },
148 150
     sortHandleChange(value) { // 权重值

+ 20
- 13
VUECODE/smart-property-manage/src/views/social/announcement/index.vue Ver arquivo

@@ -34,9 +34,9 @@
34 34
       <el-table-column prop="viewCount" label="查看数量" align="center"/>
35 35
       <el-table-column prop="sort" label="权重" align="center"/>
36 36
       <el-table-column prop="status" label="状态" align="center"/>
37
-      <el-table-column prop="createDate" label="发布时间" align="center"/>
37
+      <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
38 38
       <el-table-column prop="createUserName" label="发布人" align="center"/>
39
-      <el-table-column prop="updateDate" label="修改时间" align="center" />
39
+      <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
40 40
       <el-table-column prop="updateDateName" label="修改人" align="center"/>
41 41
     </el-table>
42 42
     <div class="block">
@@ -105,16 +105,16 @@ export default {
105 105
       value = value < 10 ? '0' + value : value
106 106
       return value
107 107
     },
108
-    formatDate(val) {
109
-      var value = new Date(val)
110
-      var year = value.getFullYear()
111
-      var month = this.padDate(value.getMonth() + 1)
112
-      var day = this.padDate(value.getDate())
113
-      var hour = this.padDate(value.getHours())
114
-      var minutes = this.padDate(value.getMinutes())
115
-      var seconds = this.padDate(value.getSeconds())
116
-      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
117
-    },
108
+    // formatDate(val) {
109
+    //   var value = new Date(val)
110
+    //   var year = value.getFullYear()
111
+    //   var month = this.padDate(value.getMonth() + 1)
112
+    //   var day = this.padDate(value.getDate())
113
+    //   var hour = this.padDate(value.getHours())
114
+    //   var minutes = this.padDate(value.getMinutes())
115
+    //   var seconds = this.padDate(value.getSeconds())
116
+    //   return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
117
+    // },
118 118
     dataQuery() { // 查询数据
119 119
       this.listLoading = true
120 120
       this.$store.dispatch('ListAnnouncement', this.listQuery).then((res) => {
@@ -146,7 +146,14 @@ export default {
146 146
     },
147 147
     add() { // 添加公告
148 148
       this.$router.push({ name: 'announcement-add' })
149
-    }
149
+    },
150
+    formatDate(val) {
151
+      var value = new Date(val)
152
+      var year = value.getFullYear()
153
+      var month = value.getMonth() + 1
154
+      var day = value.getDate()
155
+      return year + '-' + month + '-' + day
156
+    },
150 157
   }
151 158
 }
152 159
 </script>