Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

src/assets/scss/modules/home.scss

@@ -3,4 +3,9 @@
   ul li {
     color: $--color-text-regular;
   }
+}
+
+.home_bg_img {
+  background: url(~@/assets/img/home_bg.png) no-repeat;
+  background-position: center;
 }

src/i18n/zh-CN.js

@@ -3,7 +3,7 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '党群e家后台管理系统'
+t.brand.lg = '党群e家管理平台'
 t.brand.mini = '党群'
 
 t.add = '新增'

src/views/modules/home.vue

@@ -1,8 +1,8 @@
 <template>
   <el-card shadow="never"
-           class="aui-card--fill">
+           class="aui-card--fill home_bg_img">
     <div class="mod-home">
-      <h1>欢迎使用党群e家后台管理系统</h1>
+      <h1>欢迎使用党群e家管理平台</h1>
     </div>
   </el-card>
 </template>

src/views/modules/news/banner-add-or-update.vue

@@ -16,6 +16,8 @@
       <el-form-item label="标题"
                     prop="title">
         <el-input v-model="dataForm.title"
+                  maxlength="50"
+                  show-word-limit
                   placeholder="标题"></el-input>
       </el-form-item>
       <el-form-item label="所属街道"
@@ -74,6 +76,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="banner图片"
+                    v-loading="loading"
                     prop="imgUrl">
         <el-upload class="avatar-uploader"
                    :action="this.uploadUrl"
@@ -122,7 +125,8 @@ export default {
       communityList: [],
       gridList: [],
       uploadUrl: '',
-      positionList: []
+      positionList: [],
+      loading: false
     }
   },
   computed: {
@@ -214,8 +218,10 @@ export default {
     // 上传图片
     handleAvatarSuccess (res, file) {
       this.dataForm.imgUrl = res.data.url
+      this.loading = false
     },
     beforeAvatarUpload (file) {
+      this.loading = true
     },
     getListFromDict (dictType) {
       this.$http.get(`/sys/dict/listSimple/` + dictType).then(({ data: res }) => {

src/views/modules/news/news-add-or-update.vue

@@ -133,12 +133,12 @@ export default {
       },
       dataForm: {
         id: '',
-        streetId: '',
-        street: '',
-        communityId: '',
-        community: '',
-        gridId: '',
-        grid: '',
+        streetId: null,
+        street: null,
+        communityId: null,
+        community: null,
+        gridId: null,
+        grid: null,
         newsCateroryId: '',
         newsProperty: '',
         newsTitle: '',
@@ -232,7 +232,7 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.dataForm = res.data
+        this.dataForm = { ...this.dataForm, ...res.data }
         this.resetRegistTime()
         this.quillEditor.root.innerHTML = res.data.newsContent
         if (this.dataForm.streetId) {
@@ -371,7 +371,7 @@ export default {
             }
           })
         }).catch(() => { })
-        this.dataForm = []
+        this.dataForm = {}
       })
     }, 1000, { 'leading': true, 'trailing': false })
   },

src/views/modules/news/news-publish.vue

@@ -89,6 +89,7 @@
         </el-row>
         <el-row>
           <el-form-item prop="newsImageUrl"
+                        v-loading="loading"
                         label="新闻首图">
             <el-upload class="avatar-uploader"
                        :action="uploadUrl"
@@ -160,6 +161,7 @@ export default {
       communityList: [],
       gridList: [],
       categorys: [],
+      loading: false,
       // 富文本
       quillEditor: null,
       quillEditorToolbarOptions: [
@@ -375,6 +377,7 @@ export default {
       })
     }, 1000, { 'leading': true, 'trailing': false }),
     handleAvatarSuccess (res, file) {
+      this.loading = false
       this.dataForm.newsImageUrl = res.data.url
     },
     beforeAvatarUpload (file) {
@@ -387,6 +390,7 @@ export default {
       if (!isLt2M) {
         this.$message.error('上传图片大小不能超过 500KB!')
       }
+      this.loading = true
       return isJPG && isLt2M
     }
   },

src/views/modules/news/notice-add-or-update.vue

@@ -46,6 +46,8 @@
       <el-form-item label="通知标题"
                     prop="noticeTitle">
         <el-input v-model="dataForm.noticeTitle"
+                  maxlength="50"
+                  show-word-limit
                   placeholder="通知标题"></el-input>
       </el-form-item>
       <el-form-item prop="noticeContent"
@@ -86,12 +88,12 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        streetId: '',
-        street: '',
-        communityId: '',
-        community: '',
-        gridId: '',
-        grid: '',
+        streetId: null,
+        street: null,
+        communityId: null,
+        community: null,
+        gridId: null,
+        grid: null,
         noticeTitle: '',
         noticeContent: ''
       },
@@ -195,7 +197,7 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.dataForm = res.data
+        this.dataForm = { ...this.dataForm, ...res.data }
         this.quillEditor.root.innerHTML = res.data.noticeContent
         if (this.dataForm.streetId) {
           if (this.dataForm.communityId === 0) {