diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue
index 0c7fc05f..bdf0a988 100644
--- a/src/views/modules/communityParty/heart/heartFinish.vue
+++ b/src/views/modules/communityParty/heart/heartFinish.vue
@@ -3,9 +3,10 @@
+ class="div_form mgl10">
+ min-width="320">
@@ -359,10 +360,17 @@ export default {
.div_table {
display: flex;
- justify-content: center;
+ justify-content: flex-start;
.m_table {
flex: 0 0 1200px;
// padding: 20px;
}
}
+.div_form {
+ width: 90%;
+ margin-top: 20px;
+}
+.mgl10 {
+ margin-left: 20px;
+}
\ No newline at end of file
diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
index 701b62df..8f3c9bfe 100644
--- a/src/views/modules/communityParty/heart/heartForm.vue
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -50,6 +50,7 @@
:action="uploadUlr"
list-type="picture-card"
:on-exceed="exceedPic"
+ :before-upload="beforeAvatarUpload"
:on-remove="removePic"
:file-list="replayImgList"
:on-change="handleEditChange"
@@ -85,6 +86,7 @@
style="display: block"
label-width="150px">
@@ -94,6 +96,7 @@
style="display: block"
label-width="150px">
@@ -102,7 +105,7 @@
label-width="150px"
style="display: block">
@@ -115,7 +118,7 @@
label-width="150px"
style="display: block">
@@ -158,7 +161,7 @@
type="textarea"
maxlength="200"
show-word-limit
- :rows="5"
+ :rows="7"
placeholder="请输入报名条件,不超过200字"
v-model="formData.requirement">
@@ -188,6 +191,7 @@
style="display: block"
label-width="150px">
@@ -407,7 +411,7 @@ export default {
actId: "",
actLatitude: null,
actLongitude: null,
- actQuota: undefined,
+ actQuota: 0,
actStartTime: "",
actType: "heart",
@@ -418,7 +422,7 @@ export default {
noticePassedPeople: false,
requirement: "",
- reward: undefined,
+ reward: 0,
signInAddress: "",
signInEndTime: "",
@@ -457,7 +461,6 @@ export default {
},
//图片相关 oss/file/uploadvariedfile
- dialogImageUrl: 'oss/file/uploadvariedfile',
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
// upload_url: '', // 上传URL
upload_name: '', // 图片或视频名称
@@ -703,6 +706,16 @@ export default {
this.$message.warning("只能上传1张封面图")
},
+ beforeAvatarUpload (file) {
+ const isJPG = file.type === 'image/jpeg';
+ const isLt2M = file.size / 1024 / 1024 < 10;
+
+
+ if (!isLt2M) {
+ this.$message.error('上传图片大小不能超过 10MB!');
+ }
+ return isLt2M;
+ },
handleSuccess (response, file, fileList) {
this.replayImgList.push(file)
this.formData.coverPic = response.data.url
@@ -901,7 +914,7 @@ export default {
actId: "",
actLatitude: null,
actLongitude: null,
- actQuota: undefined,
+ actQuota: 0,
actStartTime: "",
actType: "heart",
@@ -912,7 +925,7 @@ export default {
noticePassedPeople: false,
requirement: "",
- reward: undefined,
+ reward: 0,
signInAddress: "",
signInEndTime: "",
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index f6cc8bca..1450ac74 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -266,7 +266,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'报名审核'"
- width="1450px"
+ width="90%"
top="5vh"
class="dialog-h"
@closed="auditDiaClose">
@@ -278,7 +278,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'查看人员'"
- width="1550px"
+ width="90%"
top="5vh"
class="dialog-h"
@closed="personDiaClose">
@@ -292,7 +292,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'活动结束'"
- width="1350px"
+ width="1250px"
top="5vh"
class="dialog-h"
@closed="finishDiaClose">
@@ -309,7 +309,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'活动回顾'"
- width="1350px"
+ width="1150px"
top="5vh"
class="dialog-h"
@closed="reviewDiaClose">
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
new file mode 100644
index 00000000..049037cd
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -0,0 +1,2071 @@
+
+
+
+
+
+
+
+
+
+ 五大图层
+
+
五大图层>
+
+ 个人档案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
{{item.label}}
+
+
+
+
+
+
+
+
+
![]()
+
{{colItem.categoryName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file