From c69cf57afc65de34139c0377a5900477b41a3cce Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 8 Aug 2022 13:47:48 +0800 Subject: [PATCH 1/7] dd --- .../modules/shequzhili/xiangmu/cpts/project-info.vue | 3 +-- .../visual/communityGovern/shijianchuli/event-info.vue | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index 4860e5939..53ea7053c 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -335,9 +335,8 @@ > - + diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index 2aed96664..8668aad4b 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -97,13 +97,13 @@
{{ item.departmentName }}
- +
From f9862ee9bc5776179ceb07dd8b4955956f67bc39 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 8 Aug 2022 13:50:32 +0800 Subject: [PATCH 2/7] dd --- src/views/modules/shequzhili/xiangmu/cpts/project-info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index 53ea7053c..a174146c8 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -335,7 +335,7 @@ > - + Date: Tue, 9 Aug 2022 16:53:18 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/statics/index.vue | 462 ++++++++++++++++++ 1 file changed, 462 insertions(+) create mode 100644 src/views/modules/shequzhili/statics/index.vue diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue new file mode 100644 index 000000000..396935fda --- /dev/null +++ b/src/views/modules/shequzhili/statics/index.vue @@ -0,0 +1,462 @@ + + + + + + From 6817d22353977bda33f29e3a213fea204fa14028 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 10 Aug 2022 10:18:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1123?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/statics/index.vue | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue index 396935fda..5897a5d08 100644 --- a/src/views/modules/shequzhili/statics/index.vue +++ b/src/views/modules/shequzhili/statics/index.vue @@ -13,18 +13,18 @@ --> + prop="endTime" label-width="100px"> 截止累计值 区间新增值 - - + + + + @@ -120,13 +126,6 @@ import { dateFormats } from '@/utils/index' export default { data () { return { - mixinViewModuleOptions: { - getDataListURL: '/data/stats/factAgencyUserHouseDaily/page', - getDataListIsPage: true, - deleteURL: '/data/stats/factAgencyUserHouseDaily', - deleteIsBatch: true, - exportURL: '/data/stats/factAgencyUserHouseDaily/export' - }, exportLoading: false, dataListLoading: false, optionsA: [], @@ -140,9 +139,9 @@ export default { timeRange: '', dataForm: { customerId: this.$store.state.user.customerId, - agencyId: '', - startTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()), - endTime: '', + agencyId: this.$store.state.user.agencyId, + startTime: '', + endTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()), type: 'end' }, total: 0, @@ -168,6 +167,7 @@ export default { this.dataForm.startTime = ""; this.dataForm.endTime = ""; } + console.log('startTime----w', this.dataForm.startTime) } }, computed: { @@ -187,13 +187,13 @@ export default { this.$refs[formName].resetFields(); this.timeRange = ""; this.dataForm.startTime = ""; - this.dataForm.endTime = ""; + this.dataForm.endTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date()) this.dataForm.type = 'end'; this.pageNo = 1 this.getTableList() }, handleSearch() { - this.dataForm.type = 1 + // this.dataForm.type = 1 this.pageNo = 1 this.getTableList() }, @@ -213,12 +213,15 @@ export default { this.dataForm.startTime = '' this.dataForm.endTime = '' if (val == 'end') { - this.dataForm.startTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date()) + this.$nextTick(() => { + this.dataForm.endTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date()) + }) + console.log('endTime----', this.dataForm.endTime) } }, exportHandle () { - const url = '/data/aggregator/org/orgProjectDetailList/export' - this.dataForm.type = 1 + const url = '/data/aggregator/datastats/nowstatsdataexport' + // this.dataForm.type = 1 this.exportLoading = true this.$http({ method: 'Post', @@ -277,12 +280,13 @@ export default { pcEventCount += item.pcEventCount projectCount += item.projectCount issueProjectCount += item.issueProjectCount - resiUicEventProjectCountserCount += item.icEventProjectCount + icEventProjectCount += item.icEventProjectCount agencyProjectCount += item.agencyProjectCount }) } this.tableData.push({ + orgName: this.$store.state.user.agencyName, resiUserCount, partyMemberCount, icEventCount, @@ -313,8 +317,8 @@ export default { const { user } = this.$store.state const _data = { ...this.dataForm, - pageNo: this.pageNo, - pageSize: this.pageSize + // pageNo: this.pageNo, + // pageSize: this.pageSize } this.$http .post('/data/aggregator/datastats/nowstatsdata', _data) @@ -322,8 +326,8 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } else { - this.dataList = res.data.list - this.total = res.data.total + this.dataList = res.data + // this.total = res.data.total } }) .catch(() => { @@ -349,7 +353,7 @@ export default { let { agencyList, subAgencyList } = res.data // this.optionsA = res.data // console.log(this.optionsA); - this.dataForm.agencyId = agencyList.agencyId + // this.dataForm.agencyId = agencyList.agencyId const _arr = [{...agencyList, subAgencyList: [...subAgencyList] }] this.optionsA = this.deepTree(_arr) console.log('optionsA----', this.optionsA) From 81c292ad92ee6de8139927bd165ba63d9a359f9c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 10 Aug 2022 10:54:50 +0800 Subject: [PATCH 5/7] dd --- src/views/modules/shequzhili/statics/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue index 5897a5d08..90e0a32e0 100644 --- a/src/views/modules/shequzhili/statics/index.vue +++ b/src/views/modules/shequzhili/statics/index.vue @@ -55,7 +55,7 @@ size="small" :loading="exportLoading">导出
+ :height="tableHeight"> @@ -173,8 +173,8 @@ export default { computed: { ...mapGetters(["clientHeight", "iframeHeight"]), tableHeight() { - const h = this.clientHeight - 360 + this.iframeHeigh; - const _h = this.clientHeight - 360; + const h = this.clientHeight - 330 + this.iframeHeigh; + const _h = this.clientHeight - 330; return this.$store.state.inIframe ? h : _h; }, }, From 565631f748abb58c3b5638a2fa1a908b73dcf072 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 10 Aug 2022 15:51:32 +0800 Subject: [PATCH 6/7] dd --- .../shequzhili/xiangmu/cpts/project-info.vue | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue index a174146c8..1892c6df5 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue @@ -352,9 +352,21 @@ - + + + + @@ -661,6 +673,10 @@ export default { obj.internalRemark = [ { required: true, message: "请填写内部备注", trigger: "blur" }, ]; + } else if (operateType == "dispose") { + obj.publicReply = [ + { required: true, message: "请填写公开回复", trigger: "blur" }, + ] } else { obj.internalRemark = [ { required: true, message: "请填写内部备注", trigger: "blur" }, From 23ca5ba2b09a7a3ddd39c0a60b48f8ebe3780bd4 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 11 Aug 2022 09:57:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/statics/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue index 90e0a32e0..40a9e4008 100644 --- a/src/views/modules/shequzhili/statics/index.vue +++ b/src/views/modules/shequzhili/statics/index.vue @@ -19,7 +19,7 @@