From 86e99e0c7415766b1ad6ff7a764d919a15e1a278 Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 19 Oct 2022 13:38:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=9C=A8=E8=81=8C=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=8A=A5=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/apps/AppCommunityMember/Add.vue | 195 ++++++++++++++++++ .../AppCommunityMember/AppCommunityMember.vue | 107 ++++++++++ .../apps/AppCommunityMember/Detail.vue | 89 ++++++++ .../apps/AppCommunityMember/List.vue | 155 ++++++++++++++ .../apps/AppCommunityMember/Organization.vue | 0 .../apps/AppCommunityMember/Statistics.vue | 0 6 files changed, 546 insertions(+) create mode 100644 project/pingchang/apps/AppCommunityMember/Add.vue create mode 100644 project/pingchang/apps/AppCommunityMember/AppCommunityMember.vue create mode 100644 project/pingchang/apps/AppCommunityMember/Detail.vue create mode 100644 project/pingchang/apps/AppCommunityMember/List.vue create mode 100644 project/pingchang/apps/AppCommunityMember/Organization.vue create mode 100644 project/pingchang/apps/AppCommunityMember/Statistics.vue diff --git a/project/pingchang/apps/AppCommunityMember/Add.vue b/project/pingchang/apps/AppCommunityMember/Add.vue new file mode 100644 index 00000000..e623189f --- /dev/null +++ b/project/pingchang/apps/AppCommunityMember/Add.vue @@ -0,0 +1,195 @@ + + + + \ No newline at end of file diff --git a/project/pingchang/apps/AppCommunityMember/AppCommunityMember.vue b/project/pingchang/apps/AppCommunityMember/AppCommunityMember.vue new file mode 100644 index 00000000..2217812b --- /dev/null +++ b/project/pingchang/apps/AppCommunityMember/AppCommunityMember.vue @@ -0,0 +1,107 @@ + + + + diff --git a/project/pingchang/apps/AppCommunityMember/Detail.vue b/project/pingchang/apps/AppCommunityMember/Detail.vue new file mode 100644 index 00000000..0d877c48 --- /dev/null +++ b/project/pingchang/apps/AppCommunityMember/Detail.vue @@ -0,0 +1,89 @@ + + + \ No newline at end of file diff --git a/project/pingchang/apps/AppCommunityMember/List.vue b/project/pingchang/apps/AppCommunityMember/List.vue new file mode 100644 index 00000000..4d016189 --- /dev/null +++ b/project/pingchang/apps/AppCommunityMember/List.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/project/pingchang/apps/AppCommunityMember/Organization.vue b/project/pingchang/apps/AppCommunityMember/Organization.vue new file mode 100644 index 00000000..e69de29b diff --git a/project/pingchang/apps/AppCommunityMember/Statistics.vue b/project/pingchang/apps/AppCommunityMember/Statistics.vue new file mode 100644 index 00000000..e69de29b From bf31cb10da2fc66c091b93696cc21b1ceab8137a Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 19 Oct 2022 14:16:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8A=A5=E5=88=B0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppCommunityMember/Detail.vue | 45 ++- .../apps/AppCommunityMember/Organization.vue | 326 ++++++++++++++++++ 2 files changed, 369 insertions(+), 2 deletions(-) diff --git a/project/pingchang/apps/AppCommunityMember/Detail.vue b/project/pingchang/apps/AppCommunityMember/Detail.vue index 0d877c48..919f57e8 100644 --- a/project/pingchang/apps/AppCommunityMember/Detail.vue +++ b/project/pingchang/apps/AppCommunityMember/Detail.vue @@ -33,7 +33,28 @@ @@ -57,6 +78,16 @@ export default { data() { return { info: {}, + colConfigs: [ + {prop: "signupTime", label: "报名时间", align: "center"}, + {slot: "user"}, + {prop: "reportType", label: "活动报到类型", align: "center", dict: 'partyReportSignupReportType'}, + {prop: "remark", label: "报名备注", align: "center"}, + {prop: "status", label: "报名状态", align: "center", dict: 'partyReportPersonSignupStatus'}, + {prop: "logStatus", label: "活动日志", align: "center", dict: 'partyReportSignupLogStatus'}, + {slot: "options"}, + ], + userList: [] } }, @@ -65,8 +96,9 @@ export default { }, created() { - this.dict.load('activityStatus', 'partyReportSignupStatus').then(() => { + this.dict.load('activityStatus', 'partyReportSignupStatus', 'partyReportSignupReportType', 'partyReportPersonSignupStatus', 'partyReportSignupLogStatus').then(() => { this.getInfo() + this.getList() }) }, @@ -81,6 +113,15 @@ export default { } }); }, + getList() { + this.instance.post(`/app/apppartyreport/signup-info?id=${this.id}`).then((res) => { + if (res?.data) { + res.data.map((item) => { + item.signupTime = item.signupTime.substring(0, 10) + }) + } + }); + }, cancel() { this.$emit("goBack") }, diff --git a/project/pingchang/apps/AppCommunityMember/Organization.vue b/project/pingchang/apps/AppCommunityMember/Organization.vue index e69de29b..e212067e 100644 --- a/project/pingchang/apps/AppCommunityMember/Organization.vue +++ b/project/pingchang/apps/AppCommunityMember/Organization.vue @@ -0,0 +1,326 @@ + + + + + From 3e5acf655e220a6d3830f80edb3836dcba389e78 Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 19 Oct 2022 17:04:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=9C=A8=E8=81=8C=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=8A=A5=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/apps/AppCommunityMember/Add.vue | 44 +++++++++---------- .../apps/AppCommunityMember/List.vue | 32 +++++++------- .../apps/AppCommunityMember/Organization.vue | 18 ++++---- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/project/pingchang/apps/AppCommunityMember/Add.vue b/project/pingchang/apps/AppCommunityMember/Add.vue index e623189f..1119d8ef 100644 --- a/project/pingchang/apps/AppCommunityMember/Add.vue +++ b/project/pingchang/apps/AppCommunityMember/Add.vue @@ -19,20 +19,20 @@ @@ -42,11 +42,11 @@ @@ -62,20 +62,20 @@ diff --git a/project/pingchang/apps/AppCommunityMember/List.vue b/project/pingchang/apps/AppCommunityMember/List.vue index 4d016189..3ecc505a 100644 --- a/project/pingchang/apps/AppCommunityMember/List.vue +++ b/project/pingchang/apps/AppCommunityMember/List.vue @@ -11,30 +11,30 @@ + :dict="dict" + :tableData="tableData" + :col-configs="colConfigs" + :total="total" + v-loading="loading" + style="margin-top: 6px;" + :current.sync="search.current" + :size.sync="search.size" + @getList="getList"> - + diff --git a/project/pingchang/apps/AppCommunityMember/Statistics.vue b/project/pingchang/apps/AppCommunityMember/Statistics.vue index e69de29b..167a4684 100644 --- a/project/pingchang/apps/AppCommunityMember/Statistics.vue +++ b/project/pingchang/apps/AppCommunityMember/Statistics.vue @@ -0,0 +1,839 @@ + + + + + From cc1dc9173d852b04cf600e5e3529c0adca3c0f82 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 20 Oct 2022 11:01:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8A=A5=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppCommunityMember/Statistics.vue | 593 ++++++------------ 1 file changed, 203 insertions(+), 390 deletions(-) diff --git a/project/pingchang/apps/AppCommunityMember/Statistics.vue b/project/pingchang/apps/AppCommunityMember/Statistics.vue index 167a4684..da7400b3 100644 --- a/project/pingchang/apps/AppCommunityMember/Statistics.vue +++ b/project/pingchang/apps/AppCommunityMember/Statistics.vue @@ -1,35 +1,22 @@ + + diff --git a/project/hlj/app/AppRatingTask/components/Add.vue b/project/hlj/app/AppRatingTask/components/Add.vue new file mode 100644 index 00000000..3f344d8b --- /dev/null +++ b/project/hlj/app/AppRatingTask/components/Add.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/project/hlj/app/AppRatingTask/components/Detail.vue b/project/hlj/app/AppRatingTask/components/Detail.vue new file mode 100644 index 00000000..ba60b08e --- /dev/null +++ b/project/hlj/app/AppRatingTask/components/Detail.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/project/hlj/app/AppRatingTask/components/List.vue b/project/hlj/app/AppRatingTask/components/List.vue new file mode 100644 index 00000000..d8d5c1f4 --- /dev/null +++ b/project/hlj/app/AppRatingTask/components/List.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/project/hlj/app/AppScoringTemplate/AppScoringTemplate.vue b/project/hlj/app/AppScoringTemplate/AppScoringTemplate.vue new file mode 100644 index 00000000..8d144f18 --- /dev/null +++ b/project/hlj/app/AppScoringTemplate/AppScoringTemplate.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/project/hlj/app/AppScoringTemplate/components/Add.vue b/project/hlj/app/AppScoringTemplate/components/Add.vue new file mode 100644 index 00000000..294f13f7 --- /dev/null +++ b/project/hlj/app/AppScoringTemplate/components/Add.vue @@ -0,0 +1,1567 @@ + + + + + diff --git a/project/hlj/app/AppScoringTemplate/components/Detail.vue b/project/hlj/app/AppScoringTemplate/components/Detail.vue new file mode 100644 index 00000000..ba60b08e --- /dev/null +++ b/project/hlj/app/AppScoringTemplate/components/Detail.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/project/hlj/app/AppScoringTemplate/components/List.vue b/project/hlj/app/AppScoringTemplate/components/List.vue new file mode 100644 index 00000000..4a785b75 --- /dev/null +++ b/project/hlj/app/AppScoringTemplate/components/List.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/project/hlj/app/AppScoringTemplate/components/config.js b/project/hlj/app/AppScoringTemplate/components/config.js new file mode 100644 index 00000000..9df7bb3b --- /dev/null +++ b/project/hlj/app/AppScoringTemplate/components/config.js @@ -0,0 +1,181 @@ +export const components = [ + { + type: 'options', + tips: '(可重复添加)', + label: '选项', + children: [ + { + type: 'radio', + label: '单选', + fixedLabel: '单选', + value: '', + points: '', + icon: 'iconradio', + isShowPoints: false, + required: true, + hasAnswer: false, + answer: '', + pointType: '0', + pointDict: [ + { + dictName: '此题有唯一答案和分值', + dictValue: '0' + }, + { + dictName: '每个选项都有对应分值', + dictValue: '1' + } + ], + options: [ + { + label: '选项1', + value: '', + point: '', + img: [] + }, + { + label: '选项2', + value: '', + point: '', + img: [] + } + ], + title: '' + }, + { + type: 'checkbox', + label: '多选', + fixedLabel: '多选', + points: '', + icon: 'iconcheck_box', + isShowPoints: false, + required: true, + hasAnswer: false, + answer: [], + value: [], + pointType: '0', + pointDict: [ + { + dictName: '此题有唯一答案和分值', + dictValue: '0' + }, + { + dictName: '每个选项都有对应分值', + dictValue: '1' + }, + { + dictName: '答对几项得几分,答错不得分', + dictValue: '2' + } + ], + options: [ + { + label: '选项1', + value: '', + point: '', + img: [] + }, + { + label: '选项2', + point: '', + value: '', + img: [] + } + ], + title: '' + }, + { + type: 'select', + label: '单下拉框', + fixedLabel: '单下拉框', + value: '', + points: '', + icon: 'iconSelect', + isShowPoints: false, + required: true, + hasAnswer: false, + answer: '', + pointType: '0', + pointDict: [ + { + dictName: '此题有唯一答案和分值', + dictValue: '0' + }, + { + dictName: '每个选项都有对应分值', + dictValue: '1' + } + ], + options: [ + { + label: '选项1', + value: '', + point: '', + img: [] + }, + { + label: '选项2', + value: '', + point: '', + img: [] + } + ], + title: '' + } + ] + }, + { + type: 'input', + tips: '(可重复添加)', + label: '填空', + children: [ + { + type: 'input', + label: '单行填空', + fixedLabel: '单行填空', + value: '', + pointType: '0', + icon: 'icontext_box', + isShowPoints: false, + points: '', + required: true, + hasAnswer: false, + placeholder: '请输入...', + answer: '' + }, + { + type: 'textarea', + label: '多行填空', + fixedLabel: '多行填空', + pointType: '0', + icon: 'icontext_area', + points: '', + isShowPoints: false, + required: true, + hasAnswer: false, + answer: '', + placeholder: '请输入...', + value: '' + } + ] + }, + { + type: 'annex', + tips: '(可重复添加)', + label: '附件', + children: [ + { + type: 'upload', + label: '上传图片', + fixedLabel: '上传图片', + value: '', + icon: 'iconpic', + isShowPoints: false, + points: '', + required: true, + hasAnswer: false, + answer: '' + } + ] + } +];