dingxin 6 年 前
コミット
69784cb4b1

+ 1
- 1
VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue ファイルの表示

@@ -5,7 +5,7 @@
5 5
         <el-input v-model="addForm.title"/> <!-- @keyup.delete="getFocus" -->
6 6
       </el-form-item>
7 7
       <el-form-item :label-width="formLabelWidth" label="权重 *">
8
-        <el-input v-model="addForm.sort"/>
8
+        <el-input v-model="addForm.sort" type="number"/>
9 9
       </el-form-item>
10 10
       <el-form-item :label-width="formLabelWidth" label="生效时间 *">
11 11
         <el-date-picker

+ 12
- 12
VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue ファイルの表示

@@ -1,25 +1,25 @@
1 1
 <template>
2 2
   <div id="app" class="app-container">
3 3
     <el-form ref="form" :model="form">
4
-      <el-form-item :label-width="formLabelWidth" label="标题">
4
+      <el-form-item :label-width="formLabelWidth" label="标题 *">
5 5
         <el-input v-model="form.title"/>
6 6
       </el-form-item>
7
-      <el-form-item :label-width="formLabelWidth" label="权重">
8
-        <el-input v-model="form.sort"/>
7
+      <el-form-item :label-width="formLabelWidth" label="权重 *">
8
+        <el-input v-model="form.sort" type="number"/>
9 9
       </el-form-item>
10
-      <el-form-item :label-width="formLabelWidth" label="生效时间">
10
+      <el-form-item :label-width="formLabelWidth" label="生效时间 *">
11 11
         <el-date-picker
12 12
           v-model="form.effTime"
13 13
           type="date"
14 14
           placeholder="选择日期时间"/>
15 15
       </el-form-item>
16
-      <el-form-item :label-width="formLabelWidth" label="失效时间">
16
+      <el-form-item :label-width="formLabelWidth" label="失效时间 *">
17 17
         <el-date-picker
18 18
           v-model="form.expTime"
19 19
           type="date"
20 20
           placeholder="选择日期时间"/>
21 21
       </el-form-item>
22
-      <el-form-item :label-width="formLabelWidth" label="banner图">
22
+      <el-form-item :label-width="formLabelWidth" label="banner图 *">
23 23
         <el-upload
24 24
           :show-file-list="false"
25 25
           :on-success="handleAvatarSuccess"
@@ -30,7 +30,7 @@
30 30
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
31 31
         </el-upload>
32 32
       </el-form-item>
33
-      <el-form-item :label-width="formLabelWidth" label="banner位">
33
+      <el-form-item :label-width="formLabelWidth" label="banner位  *">
34 34
         <el-select v-model="form.bannerPosition" placeholder="请选择位置">
35 35
           <el-option label="请选择位置" value="-1"/>
36 36
           <el-option
@@ -42,7 +42,7 @@
42 42
           <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
43 43
         </el-select>
44 44
       </el-form-item>
45
-      <el-form-item :label-width="formLabelWidth" label="投放社区">
45
+      <el-form-item :label-width="formLabelWidth" label="投放社区 *">
46 46
         <el-select v-model="form.communityId" placeholder="请选择社区">
47 47
           <!-- <el-option label="请选择社区" value="-1"/> -->
48 48
           <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
@@ -56,21 +56,21 @@
56 56
           type="textarea"
57 57
           placeholder="请输入跳转描述"/>
58 58
       </el-form-item> -->
59
-      <el-form-item :label-width="formLabelWidth" label="banner跳转">
59
+      <el-form-item :label-width="formLabelWidth" label="banner跳转 *">
60 60
         <el-radio v-model="form.bannerType" label="1" @change="showContent">外部超链接</el-radio>
61 61
         <el-radio v-model="form.bannerType" label="2" @change="showContent">自写文章</el-radio>
62 62
       </el-form-item>
63
-      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
63
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接 *">
64 64
         <el-input v-model="form.externalLink" placeholder="跳转链接"/>
65 65
       </el-form-item>
66 66
       <div v-if="showContentVisible">
67
-        <el-form-item :label-width="formLabelWidth" label="内容标题">
67
+        <el-form-item :label-width="formLabelWidth" label="内容标题 *">
68 68
           <el-input v-model="form.bannerTitle" placeholder="内容标题"/>
69 69
         </el-form-item>
70 70
         <!-- <el-form-item :label-width="formLabelWidth" label="内容详情">
71 71
           <el-input v-model="form.bannerContent" placeholder="内容详情"/>
72 72
         </el-form-item> -->
73
-        <el-form-item :label-width="formLabelWidth" label="内容详情">
73
+        <el-form-item :label-width="formLabelWidth" label="内容详情 *">
74 74
           <div id="father">
75 75
             <wangeditor ref="refEditor" :content="form.bannerContent" @wangeditorEvent="wangeditorValue"/>
76 76
           </div>

+ 4
- 4
VUECODE/smart-operate-manage/src/views/community/user/index.vue ファイルの表示

@@ -153,10 +153,10 @@ export default {
153 153
       var year = value.getFullYear()
154 154
       var month = value.getMonth() + 1
155 155
       var day = value.getDate()
156
-      // var hour = value.getHours()
157
-      // var minutes = value.getMinutes()
158
-      // var seconds = value.getSeconds()
159
-      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
156
+      var hour = value.getHours()
157
+      var minutes = value.getMinutes()
158
+      var seconds = value.getSeconds()
159
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
160 160
       return year + '-' + month + '-' + day
161 161
     },
162 162
     lookUserLog(id) { // 跳转查看用户日志

+ 2
- 2
VUECODE/smart-property-manage/src/views/building/buildingdata/index.vue ファイルの表示

@@ -157,8 +157,8 @@ export default {
157 157
           <span class="custom-tree-node">
158 158
             <span>{node.label}</span>
159 159
             <span>
160
-              <el-button size="mini" type="text" on-click={ () => this.append(data) }>添加节点</el-button>
161
-              <el-button size="mini" type="text" on-click={ () => this.remove(data) }>删除节点</el-button>
160
+              <el-button size="mini" type="text" on-click={ () => this.append(data) }>添加节点</el-button>
161
+              <el-button size="mini" type="text" on-click={ () => this.remove(data) }>删除节点及子节点</el-button>
162 162
             </span>
163 163
           </span>);
164 164
       }

+ 1
- 1
VUECODE/smart-property-manage/src/views/social/activity/add/index.vue ファイルの表示

@@ -5,7 +5,7 @@
5 5
         <el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 620px;"/>
6 6
       </el-form-item>
7 7
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
8
-        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片,不会显示在活动详情页</span>
8
+        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片,不会显示在活动详情页,建议尺寸1080*500,大小200KB以内</span>
9 9
         <div >
10 10
           <el-upload
11 11
             :show-file-list="false"

+ 1
- 1
VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue ファイルの表示

@@ -5,7 +5,7 @@
5 5
         <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
6 6
       </el-form-item>
7 7
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
8
-        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片,不会显示在活动详情页</span>
8
+        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片,不会显示在活动详情页,建议尺寸1080*500,大小200KB以内</span>
9 9
         <div >
10 10
           <div style="width: 500px;">
11 11
             <el-upload

+ 1
- 1
VUECODE/smart-property-manage/src/views/social/announcement/add.vue ファイルの表示

@@ -5,7 +5,7 @@
5 5
         <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 650px;"/>
6 6
       </el-form-item>
7 7
       <el-form-item label="公告轮播图" prop="announcementCarouselImg" >
8
-        <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页</span>
8
+        <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页,建议尺寸1080*500,大小200KB以内</span>
9 9
         <div>
10 10
           <x-uploader v-model="ruleForm.announcementCarouselImg"/>
11 11
           <!--<div style="width: 500px;">-->

+ 1
- 1
VUECODE/smart-property-manage/src/views/social/announcement/edit.vue ファイルの表示

@@ -5,7 +5,7 @@
5 5
         <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 704px;"/>
6 6
       </el-form-item>
7 7
       <el-form-item label="公告轮播图" prop="announcementCarouselImg">
8
-        <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页</span>
8
+        <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页,建议尺寸 1080*500,大小200KB以内</span>
9 9
         <div>
10 10
           <el-upload
11 11
             :show-file-list="false"

+ 17
- 24
VUECODE/smart-property-manage/src/views/social/transaction/transactionAdd.vue ファイルの表示

@@ -1,27 +1,23 @@
1 1
 <template>
2 2
   <div id="root">
3
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="left" label-width="150px" class="ruleForm">
4 4
 
5
-    <el-form-item class="filter-item" >
6
-        <div>话题类型&nbsp;&nbsp;<el-select v-model="ruleForm.type" placeholder="请选择" style="padding-left:4%;">
5
+    <el-form-item class="filter-item" label="话题类型" prop="type">
6
+      <el-select v-model="ruleForm.type" placeholder="请选择">
7 7
          <el-option label="议事大厅(投诉,建议,表扬,社区明星评比,业委员会选举,组织活动等)" value="0"/>
8 8
          <el-option label="友令互助(借物,宠物寄养,搭伙用餐,搭手帮忙,邻里提醒,组织春游等)" value="1"/>
9 9
          <!-- -1包括,二手,租赁,求购 -->
10 10
          <el-option label="二手租赁(咸鱼太贵,快递费太贵,想租个车位?小区里面就能买卖)" value="-1"/>
11 11
          <el-option label="其他(还有其他的?畅所欲言吧)" value="3"/>
12 12
         </el-select>
13
-        </div>
14 13
       </el-form-item>
15
-      <el-form-item  prop="transactionTitle">
16
-        <div>话题标题&nbsp;&nbsp;<el-input style="width: 80%;padding-left:4%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/></div>
14
+      <el-form-item  prop="transactionTitle" label="话题标题">
15
+       <el-input style="width: 80%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
17 16
       </el-form-item>
18
-      <el-form-item >
19
-        <div><span style="position:relative;top:-100px">话题详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容,规则,时间等" style="width: 80%;"/></div>
17
+      <el-form-item label="话题内容描述" prop="transactionContent">
18
+        <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容,规则,时间等" style="width: 80%;"/>
20 19
       </el-form-item>
21
-      <el-form-item>
22
-        <div >
23
-        <span>话题配图</span>
24
-        <div  style="padding-left:13%;transform:translateY(-20%);">
20
+      <el-form-item label="话题配图">
25 21
         <el-upload
26 22
           :on-preview="handlePictureCardPreview"
27 23
           :on-remove="handleRemove"
@@ -31,17 +27,12 @@
31 27
           list-type="picture-card">
32 28
           <i class="el-icon-plus"/>
33 29
         </el-upload>
34
-        </div>
35
-        </div>
36 30
         <el-dialog :visible.sync="dialogVisible">
37 31
           <img :src="dialogImageUrl" width="100%" alt="">
38 32
         </el-dialog>
39 33
       </el-form-item>
40
-      <el-form-item prop="sort" >
41
-        <div style="display: flex; justify-content: flex-start;">
42
-          <span style="width: 120px;">权重值</span>
43
-          <el-input-number style="width: 130px;margin-left:-2%" v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
44
-        </div>
34
+      <el-form-item prop="sort" label="权重值">
35
+          <el-input-number style="width: 130px;" v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
45 36
       </el-form-item>
46 37
       <el-form-item>
47 38
         <el-button type="primary" style="margin-left:13%"  @click="submitForm('ruleForm','1')">发布</el-button>
@@ -81,12 +72,14 @@ export default {
81 72
       dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
82 73
       dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
83 74
       rules: {
84
-        announcementTitle: [
85
-          { required: true, message: '请输入话题名称', trigger: 'blur' },
86
-          { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
75
+        type: [
76
+          { required: true, message: '请选择话题类型', trigger: 'change' }
77
+        ],
78
+        transactionTitle: [
79
+          { required: true, message: '请输入话题标题', trigger: 'blur' }
87 80
         ],
88
-        announcementContent: [
89
-          { required: true, message: '话题详细描述', trigger: 'blur' }
81
+        transactionContent: [
82
+          { required: true, message: '请输入话题描述', trigger: 'blur' }
90 83
         ],
91 84
         sort: [
92 85
           { required: true, message: '请输入权重值', trigger: 'change' }

+ 44
- 41
VUECODE/smart-property-manage/src/views/social/transaction/transactionEdit.vue ファイルの表示

@@ -1,9 +1,8 @@
1 1
 <template>
2 2
   <div id="root">
3
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
4
-
5
-    <el-form-item class="filter-item" >
6
-        <div>话题类型&nbsp;&nbsp;<el-select v-model="ruleForm.type" placeholder="请选择" style="padding-left:4%;">
3
+    <el-form ref="ruleForm" :model="ruleForm"  :rules="rules" label-position="left" label-width="150px" class="ruleForm">
4
+      <el-form-item class="filter-item" label="话题类型" prop="type">
5
+        <el-select v-model="ruleForm.type" placeholder="请选择">
7 6
          <el-option label="选择状态" value="" />
8 7
          <el-option label="议事大厅" value="0"/>
9 8
          <el-option label="友令互助" value="1"/>
@@ -11,18 +10,14 @@
11 10
          <el-option label="二手租赁" value="2"/>
12 11
          <el-option label="其他" value="3"/>
13 12
         </el-select>
14
-        </div>
15 13
       </el-form-item>
16
-      <el-form-item  prop="transactionTitle">
17
-        <div>话题标题&nbsp;&nbsp;<el-input style="width: 80%;padding-left:4%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/></div>
14
+      <el-form-item  prop="transactionTitle" label="话题标题">
15
+        <el-input style="width: 80%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
18 16
       </el-form-item>
19
-      <el-form-item >
20
-        <div><span style="position:relative;top:-100px">话题详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容,规则,时间等" style="width: 80%;"/></div>
17
+      <el-form-item label="话题内容描述" prop="transactionContent">
18
+        <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容,规则,时间等" style="width: 80%;"/>
21 19
       </el-form-item>
22
-      <el-form-item>
23
-        <div >
24
-          <div>话题配图</div>
25
-        <div  style="padding-left:13%;transform:translateY(-20%);">
20
+      <el-form-item label="* 话题配图">
26 21
         <el-upload
27 22
           :on-preview="handlePictureCardPreview"
28 23
           :on-remove="handleRemove"
@@ -33,21 +28,18 @@
33 28
           list-type="picture-card">
34 29
           <i class="el-icon-plus"/>
35 30
         </el-upload>
36
-        </div>
37
-        </div>
38 31
         <el-dialog :visible.sync="dialogVisible">
39 32
           <img :src="dialogImageUrl" width="100%" alt="">
40 33
         </el-dialog>
41 34
       </el-form-item>
42
-      <el-form-item  prop="sort">
43
-        <div style="display: flex; justify-content: flex-start;">
44
-          <span style="width: 120px;">权重值</span>
35
+      <el-form-item  prop="sort" label="权重值">
36
+        <div>
45 37
           <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
46 38
         </div>
47 39
       </el-form-item>
48 40
       <el-form-item>
49
-        <div style="padding-left:15%;">
50
-        <el-button type="primary" @click="submitForm('1')" >发布</el-button>
41
+        <div>
42
+        <el-button type="primary" @click="submitForm('ruleForm')" >发布</el-button>
51 43
         </div>
52 44
       </el-form-item>
53 45
     </el-form>
@@ -85,13 +77,18 @@ export default {
85 77
       imageUrl: '', // 轮播图预览
86 78
       dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
87 79
       dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
88
-      rules: {
89
-        announcementTitle: [
90
-          { required: true, message: '请输入公告名称', trigger: 'blur' },
91
-          { min: 1, max: 20, message: '长度在 15 个字符以内', trigger: 'blur' }
80
+       rules: {
81
+        type: [
82
+          { required: true, message: '请选择话题类型', trigger: 'change' }
92 83
         ],
93
-        announcementContent: [
94
-          { required: true, message: '公告详细描述', trigger: 'blur' }
84
+        transactionTitle: [
85
+          { required: true, message: '请输入话题标题', trigger: 'blur' }
86
+        ],
87
+        transactionContent: [
88
+          { required: true, message: '请输入话题描述', trigger: 'blur' }
89
+        ],
90
+        contentImg: [
91
+          { required: true, message: '话题配图',trigger: 'blur'}
95 92
         ],
96 93
         sort: [
97 94
           { required: true, message: '请输入权重值', trigger: 'change' }
@@ -106,21 +103,23 @@ export default {
106 103
     this.transactionById()
107 104
   },
108 105
   methods: {
109
-    submitForm(status) {
110
-      console.log(status)
111
-      // 加载框
112
-    //   const loading = this.$loading({
113
-    //     lock: true,
114
-    //     text: 'Loading',
115
-    //     spinner: 'el-icon-loading',
116
-    //     background: 'rgba(0, 0, 0, 0.7)'
117
-    //   })
118
-
106
+    submitForm(formName) {
107
+       //加载框
108
+      const loading = this.$loading({
109
+        lock: true,
110
+        text: 'Loading',
111
+        spinner: 'el-icon-loading',
112
+        background: 'rgba(0, 0, 0, 0.7)'
113
+      })  
114
+      this.$refs[formName].validate((valid) => {
115
+      if (valid) {
119 116
           if (this.ruleForm.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
120 117
             this.$message.error('内容描述 和 图至少要存在一个!')
118
+            // 关闭加载框
119
+            loading.close()
121 120
             return
122 121
           }
123
-          this.ruleForm.status = status // 发布状态
122
+          this.ruleForm.status = 1 // 发布状态
124 123
           this.$store.dispatch('transaction/TransactionsEdit', this.ruleForm).then((res) => {
125 124
             this.$router.push({ name: 'transaction-import' })
126 125
             // this.$message.error(res.message)
@@ -128,10 +127,14 @@ export default {
128 127
           }).catch(() => {
129 128
             console.log('error AddActivity')
130 129
           })
131
-        
132
-  
133
-      // 关闭加载框
134
-      // loading.close()
130
+           } else {
131
+          console.log('error submit!!')
132
+          loading.close()
133
+          return false
134
+        }
135
+    })
136
+          // 关闭加载框
137
+      loading.close()
135 138
     },
136 139
     resetForm(formName, status) {
137 140
       console.log(status)