From dcb67ec3c7b894e7f555ea3616a77bab223401ce Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 11 Aug 2020 16:30:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E6=B4=BB=E8=B7=83=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E3=80=91-?= =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../active/activeusercount-add-or-update.vue | 173 ++++++++++++++++ .../analysis/active/activeusercount.vue | 183 +++++++++++++++++ .../active/activeuserinfo-add-or-update.vue | 194 ++++++++++++++++++ .../analysis/active/activeuserinfo.vue | 154 ++++++++++++++ .../analysis/active/activeuserroute.vue | 29 +++ 5 files changed, 733 insertions(+) create mode 100644 src/views/modules/analysis/active/activeusercount-add-or-update.vue create mode 100644 src/views/modules/analysis/active/activeusercount.vue create mode 100644 src/views/modules/analysis/active/activeuserinfo-add-or-update.vue create mode 100644 src/views/modules/analysis/active/activeuserinfo.vue create mode 100644 src/views/modules/analysis/active/activeuserroute.vue diff --git a/src/views/modules/analysis/active/activeusercount-add-or-update.vue b/src/views/modules/analysis/active/activeusercount-add-or-update.vue new file mode 100644 index 00000000..0c30cf80 --- /dev/null +++ b/src/views/modules/analysis/active/activeusercount-add-or-update.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/views/modules/analysis/active/activeusercount.vue b/src/views/modules/analysis/active/activeusercount.vue new file mode 100644 index 00000000..f0f8c180 --- /dev/null +++ b/src/views/modules/analysis/active/activeusercount.vue @@ -0,0 +1,183 @@ + + + diff --git a/src/views/modules/analysis/active/activeuserinfo-add-or-update.vue b/src/views/modules/analysis/active/activeuserinfo-add-or-update.vue new file mode 100644 index 00000000..725f9611 --- /dev/null +++ b/src/views/modules/analysis/active/activeuserinfo-add-or-update.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/views/modules/analysis/active/activeuserinfo.vue b/src/views/modules/analysis/active/activeuserinfo.vue new file mode 100644 index 00000000..ef579b0e --- /dev/null +++ b/src/views/modules/analysis/active/activeuserinfo.vue @@ -0,0 +1,154 @@ + + + diff --git a/src/views/modules/analysis/active/activeuserroute.vue b/src/views/modules/analysis/active/activeuserroute.vue new file mode 100644 index 00000000..e6fa23dc --- /dev/null +++ b/src/views/modules/analysis/active/activeuserroute.vue @@ -0,0 +1,29 @@ + + + + From fa2f22f7b5d915386a89eb0633e49e1bb0e296fb Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 11 Aug 2020 17:25:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=90=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E3=80=91-=E3=80=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=B0=83=E6=95=B4=E3=80=81=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B4=BB=E8=B7=83=E7=8E=87=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/analysis/export/operation.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/modules/analysis/export/operation.vue b/src/views/modules/analysis/export/operation.vue index b15653e5..8ec0e55a 100644 --- a/src/views/modules/analysis/export/operation.vue +++ b/src/views/modules/analysis/export/operation.vue @@ -28,7 +28,7 @@
@@ -164,7 +165,7 @@ export default { mixins: [mixinViewModule], watch: { 'timeFlag': function (val) { - if (val === 0) { + if (val === '0') { this.dataForm.operationStartTime = '' this.dataForm.operationEndTime = '' this.time = [] From f3b69f000bc24acd2f5f42030892e2e00eab4e6a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 11 Aug 2020 18:20:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E6=B4=BB=E8=B7=83=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E3=80=91-?= =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/analysis/active/activeuserinfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/analysis/active/activeuserinfo.vue b/src/views/modules/analysis/active/activeuserinfo.vue index ef579b0e..f2e3e9b0 100644 --- a/src/views/modules/analysis/active/activeuserinfo.vue +++ b/src/views/modules/analysis/active/activeuserinfo.vue @@ -6,7 +6,7 @@ {{"返回"}}
- + Date: Mon, 17 Aug 2020 17:51:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E3=80=91=E6=96=B0=E5=A2=9E=E6=B4=BB=E5=8A=A8=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/heart/actinfo-add-or-update.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue index c688a82f..67cc2c32 100644 --- a/src/views/modules/heart/actinfo-add-or-update.vue +++ b/src/views/modules/heart/actinfo-add-or-update.vue @@ -57,6 +57,7 @@ prop="signupEndTime"> { @@ -884,3 +887,8 @@ export default { } } + From 5dd8dbff1713168cc4ac5b5b3aca7bf496b241fa Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 17 Aug 2020 18:07:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E3=80=91=E6=96=B0=E5=A2=9E=E6=B4=BB=E5=8A=A8=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/heart/actinfo-add-or-update.vue | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue index 67cc2c32..d1ae3434 100644 --- a/src/views/modules/heart/actinfo-add-or-update.vue +++ b/src/views/modules/heart/actinfo-add-or-update.vue @@ -413,7 +413,26 @@ export default { } }, created () { - this.dataForm.signupEndTime = new Date(new Date().getTime() + 24 * 60 * 60 * 1000) + // 初始化报名截止时间 + var signupEndTimeDate = new Date(new Date().getTime() + 24 * 60 * 60 * 1000) + var year = signupEndTimeDate.getFullYear().toString() + var month = (signupEndTimeDate.getMonth() + 1).toString() + if (month < 10) { + month = '0' + month + } + var day = signupEndTimeDate.getDate().toString() + if (day < 10) { + day = '0' + day + } + var hours = signupEndTimeDate.getHours().toString() + if (hours < 10) { + hours = '0' + hours + } + var minutes = signupEndTimeDate.getMinutes().toString() + if (minutes < 10) { + minutes = '0' + minutes + } + this.dataForm.signupEndTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes this.$http .get(`/sys/user/deptOptions/getByLoginUser`) .then(({ data: res }) => {