From 07da160ab82963316681936e3b8615d285c4efcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 7 Jan 2022 15:58:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=95=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppVillageDiscuss/Add.vue | 61 ++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue index 48c34ef2..23a7d04d 100644 --- a/src/apps/AppVillageDiscuss/Add.vue +++ b/src/apps/AppVillageDiscuss/Add.vue @@ -11,7 +11,7 @@ - + @@ -39,7 +39,7 @@
- +
@@ -53,7 +53,7 @@
- +
@@ -94,7 +94,11 @@ export default { data() { return { id: '', - form: { type: 0 }, + form: { + type: 0, + areaId: '', + areaName: '', + }, flag: false, showStartTime: false, showEndTime: false, @@ -111,6 +115,7 @@ export default { checked: true, list: [], content: '', + keys: ['A', 'B', 'C', 'D', 'E', 'F', 'G'], } }, computed: { ...mapState(['user']) }, @@ -147,22 +152,40 @@ export default { if (!this.form.discussDeadline) { return this.$u.toast('请选择 议事截止时间') } - this.$http - .post(`/app/appvillagediscuss/addOrUpdate`, { - ...this.form, - images: JSON.stringify(this.form.images), - id: this.id, - }) - .then((res) => { - if (res?.code == 0) { - uni.$emit('update') - this.$u.toast('发布成功') - this.flag = true - setTimeout(() => { - uni.navigateBack({}) - }, 600) - } + + if (this.opts == 1) { + var lists = [] + this.list.map((item, index) => { + item.content == item, item.item == this.keys[index] + lists.push({ + content: item, + item: this.keys[index], + }) }) + console.log(lists) + } + + var params = { + ...this.form, + // voteItems: this.list, + voteItems: lists, + anonymous: this.checked == true ? 1 : 0, + createUserId: this.user.id, + createUserName: this.user.name, + images: JSON.stringify(this.form.images), + voteType: this.opts, + } + + this.$http.post(`/app/appvillagediscuss/addOrUpdate`, params).then((res) => { + if (res.code == 0) { + uni.$emit('update') + this.$u.toast('发布成功') + this.flag = true + setTimeout(() => { + uni.navigateBack({}) + }, 600) + } + }) }, addOpts() { From c0c02d05ce5b5fad8e710774a657f34ffa9637b9 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 7 Jan 2022 16:18:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=8F=E6=89=8B=E6=8B=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppHandSnapshot/AppHandSnapshot.vue | 4 +- src/apps/AppHandSnapshot/Detail.vue | 2 +- src/apps/AppHandSnapshot/Statistics.vue | 86 ++++++++------------ 3 files changed, 38 insertions(+), 54 deletions(-) diff --git a/src/apps/AppHandSnapshot/AppHandSnapshot.vue b/src/apps/AppHandSnapshot/AppHandSnapshot.vue index 419de655..edc3e8d8 100644 --- a/src/apps/AppHandSnapshot/AppHandSnapshot.vue +++ b/src/apps/AppHandSnapshot/AppHandSnapshot.vue @@ -79,7 +79,9 @@ export default { }) }, onReachBottom() { - uni.$emit('nextList') + if(!this.tabIndex) { + uni.$emit('nextList') + } }, } diff --git a/src/apps/AppHandSnapshot/Detail.vue b/src/apps/AppHandSnapshot/Detail.vue index aae9918e..899f1a32 100644 --- a/src/apps/AppHandSnapshot/Detail.vue +++ b/src/apps/AppHandSnapshot/Detail.vue @@ -48,7 +48,7 @@ -->
- 照片 + 照片
diff --git a/src/apps/AppHandSnapshot/Statistics.vue b/src/apps/AppHandSnapshot/Statistics.vue index 812b6fd4..7e1c7262 100644 --- a/src/apps/AppHandSnapshot/Statistics.vue +++ b/src/apps/AppHandSnapshot/Statistics.vue @@ -8,8 +8,8 @@
今日概况
-
-

{{item.num}}

+
+

{{item.value}}

{{item.label}}

@@ -20,11 +20,11 @@

受理率

-

83.3%

+

{{info.businessCountMap['受理率'] * 100}}%

办结率

-

83.3%

+

{{info.businessCountMap['办结率'] * 100}}%

@@ -35,15 +35,15 @@

累计反馈

-

30

+

{{info.businessCountMap['累计反馈']}}

累计受理

-

30

+

{{info.businessCountMap['累计受理']}}

累计办理

-

30

+

{{info.businessCountMap['累计办结']}}

@@ -63,13 +63,13 @@
小区管理
-
共11条 | 已办结9 +
共11条 | 已办结9
小区管理
-
共11条 | 已办结9 +
共11条 | 已办结9
@@ -88,46 +88,27 @@ export default { props: {}, data() { return { - contents: [ - { - label: '待受理', - num: 5 - }, - { - label: '办理中', - num: 5 - }, - { - label: '今日上报', - num: 5 - }, - { - label: '今日办结', - num: 5 - } - ] + todayList: [], + info: {} } }, - onLoad() { - + mounted() { + this.getStatistics() }, - onShow() {}, methods: { - getList() { - this.$http - .post('/app/appvisitvondolence/list', null, { - params: { - size: this.size, - current: this.current, - createUserId: this.currentTabs == 1 ? this.user.id : '', - }, - }) - .then((res) => { - if (res.code == 0) { - this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records - this.pages = res.data.pages - } - }) + getStatistics() { + this.$http.post('/app/appclapeventinfo/countByGirdMember').then((res) => { + if (res.code == 0) { + this.info = res.data + Object.keys(res.data.todayCountMap).forEach((key) => { + var info = { + label: key, + value: res.data.todayCountMap[key] + } + this.todayList.push(info) + }) + } + }) }, goDetail(item) { @@ -219,8 +200,8 @@ export default { display: flex; padding: 40px 0 30px 0; .left{ - width: 240px; - padding: 20px 0 78px 64px; + width: 220px; + padding: 20px 0 78px 50px; .item{ margin-bottom: 58px; } @@ -230,6 +211,7 @@ export default { font-weight: bold; color: #3B424A; line-height: 64px; + letter-spacing: -4px; } p{ font-size: 28px; @@ -239,7 +221,7 @@ export default { } } .right{ - width: calc(100% - 240px); + width: calc(100% - 220px); display: flex; .img{ width: 140px; @@ -273,16 +255,16 @@ export default { } } .bg1{ - width: 304px; + width: 272px; background-image: url('./components/img/bg-1.png'); } .bg2{ - width: 266px; + width: 234px; background-image: url('./components/img/bg-2.png'); margin-left: 16px; } .bg3{ - width: 240px; + width: 208px; background-image: url('./components/img/bg-3.png'); margin-left: 32px; } @@ -309,7 +291,7 @@ export default { line-height: 48px; .line-bg{ display: inline-block; - width: 63%; + width: 56%; height: 14px; background: #D7D8D9; border-radius: 8px; From d43e31cee5cc23a24749a6ebad2ae5eb6555fd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 7 Jan 2022 16:25:43 +0800 Subject: [PATCH 3/3] bug --- src/apps/AppVillageDiscuss/Add.vue | 40 ++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Add.vue b/src/apps/AppVillageDiscuss/Add.vue index 23a7d04d..01b903f9 100644 --- a/src/apps/AppVillageDiscuss/Add.vue +++ b/src/apps/AppVillageDiscuss/Add.vue @@ -3,7 +3,7 @@
- + @@ -39,7 +39,7 @@
- +
@@ -53,7 +53,7 @@
- +
@@ -112,9 +112,9 @@ export default { timestamp: true, }, opts: 0, - checked: true, + checked: false, list: [], - content: '', + contents: '', keys: ['A', 'B', 'C', 'D', 'E', 'F', 'G'], } }, @@ -124,7 +124,7 @@ export default { this.id = o.id this.getDetail() } - + this.form.areaId = this.user.areaId this.$dict.load('discussType').then(() => { // this.areaId = this.user.areaId }) @@ -147,16 +147,34 @@ export default { submit() { if (this.flag) return if (!this.form.content) { - return this.$u.toast('请输入 主题') + return this.$u.toast('请输入主题') } - if (!this.form.discussDeadline) { - return this.$u.toast('请选择 议事截止时间') + if (!this.form.areaId) { + return this.$u.toast('请输入发布地区') + } + // if (!this.form.discussDeadline) { + // return this.$u.toast('请选择议事截止时间') + // } + // if (!this.form.publicityDeadline) { + // return this.$u.toast('请选择公示截止时间') + // } + if (this.form.type == 1) { + if (this.opts == 0) { + if (!this.form.contents) { + return this.$u.toast('请输入单选选项') + } + } + if (this.opts == 1) { + if (!this.list.length > 0) { + return this.$u.toast('请输入多选选项') + } + } } if (this.opts == 1) { var lists = [] this.list.map((item, index) => { - item.content == item, item.item == this.keys[index] + item.contents == item, item.item == this.keys[index] lists.push({ content: item, item: this.keys[index], @@ -168,6 +186,8 @@ export default { var params = { ...this.form, // voteItems: this.list, + areaId: this.form.areaId, + areaName: this.form.areaName, voteItems: lists, anonymous: this.checked == true ? 1 : 0, createUserId: this.user.id,