From 3cf5017e0a675d446bb96d938396bc34cc6c8c62 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 30 Jul 2024 09:44:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/views/feedbackSurvey.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.dev b/.env.dev index 57d3c252..4b773b76 100644 --- a/.env.dev +++ b/.env.dev @@ -6,6 +6,6 @@ NODE_ENV = 'development' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' VUE_APP_BASE_URL = 'https://api.aida.com.hk' # 佩佩 -VUE_APP_BASE_URL = 'http://192.168.1.7:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/src/views/feedbackSurvey.vue b/src/views/feedbackSurvey.vue index a3144df1..145ff306 100644 --- a/src/views/feedbackSurvey.vue +++ b/src/views/feedbackSurvey.vue @@ -725,6 +725,7 @@ export default defineComponent({ forbid.value = true for (const iterator in data) { if(typeof data[iterator] == 'object'){ + feedbackData[iterator] = [] data[iterator].forEach((item:any)=>{ if(item*1){ feedbackData[iterator].push(item) From 9980a519c1375574398f57d9eb506047b1289157 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 30 Jul 2024 10:04:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E9=A1=B5=E9=9D=A2=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Administrator.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue index 6b17a177..ac018c26 100644 --- a/src/views/Administrator.vue +++ b/src/views/Administrator.vue @@ -23,16 +23,16 @@ - {{menu.name}} + {{menu.name}} - +
- {{child.name}} + {{child.name}}
@@ -315,6 +315,12 @@ export default defineComponent({ font-family: Adobe Heiti Std; font-weight: normal; color: #808185; + white-space: nowrap; /* 禁止文本换行 */ + overflow: hidden; /* 溢出隐藏 */ + text-overflow: ellipsis; /* 文本溢出时显示省略号 */ + width: 100%; + display: block; + } .ant-menu-item-selected{ background: #F3F4F8; From 1e2dafcc31d7e88229acd9dc04f5df86292c1837 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 31 Jul 2024 09:41:44 +0800 Subject: [PATCH 3/5] fix --- src/component/HomePage/Generate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 4ec4236c..74494d22 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -335,7 +335,7 @@ export default defineComponent({ }, workspaceCom(newVal,oldVal){ this.workspace = newVal - this.upload.gender = newVal?.sexEnum?.name + this.upload.gender = newVal?.sexEnum?.value }, scene:{ handler(newVal,oldVal){ From ce7892e574a6a6d06a61b0b7bccfbde47ff0ddcd Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 1 Aug 2024 18:38:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=89=8B=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/HomeMain.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 731935fd..89d0cfac 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -292,9 +292,9 @@ export default defineComponent({ }, //教程 getTutorial(){ - let url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-使用手册-0705.pdf' + let url = 'https://code-create.com.hk/wp-content/uploads/2024/08/aida_3.0-Manual-0705-CN.pdf' if(this.locale == 'ENGLISH'){ - url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-Manual-0705-1.pdf' + url = 'https://code-create.com.hk/wp-content/uploads/2024/08/aida_3.0-Manual-0705-EN.pdf' showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/07/AiDA-demo-video_0709_EN.webm'}) }else{ showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/07/AiDA-demo-video_0709_CN.webm'}) From 12ea743827eb4cefb386b768a77e7ddda8685eb5 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 5 Aug 2024 16:15:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- package-lock.json | 59 ++ package.json | 1 + src/assets/style/style.css | 236 +++++-- src/assets/style/style.less | 108 ++- src/component/Administrator/TestClickData.vue | 29 +- src/component/Administrator/allUser.vue | 650 ++++++++++++----- .../Administrator/allUserPoerations.vue | 302 ++++++++ .../Administrator/recentActiveChart.vue | 227 ++++++ .../Administrator/recentActiveUser.vue | 303 ++++++++ .../Administrator/recentActiveUserChart.vue | 195 ++++++ src/component/Administrator/recentNewUser.vue | 320 +++++++++ .../Administrator/recentNewUserChart.vue | 223 ++++++ src/component/Administrator/trialAllUser.vue | 310 ++++++++ src/component/Administrator/trialApproval.vue | 10 +- .../trialUserConversionRateChart.vue | 158 +++++ .../Administrator/trialUserCountry.vue | 152 ++++ src/component/Detail/habit.vue | 4 + src/router/index.ts | 32 + src/tool/country.js | 663 ++++++++++++++++++ src/tool/https.js | 15 +- src/views/Administrator.vue | 100 ++- 22 files changed, 3762 insertions(+), 337 deletions(-) create mode 100644 src/component/Administrator/allUserPoerations.vue create mode 100644 src/component/Administrator/recentActiveChart.vue create mode 100644 src/component/Administrator/recentActiveUser.vue create mode 100644 src/component/Administrator/recentActiveUserChart.vue create mode 100644 src/component/Administrator/recentNewUser.vue create mode 100644 src/component/Administrator/recentNewUserChart.vue create mode 100644 src/component/Administrator/trialAllUser.vue create mode 100644 src/component/Administrator/trialUserConversionRateChart.vue create mode 100644 src/component/Administrator/trialUserCountry.vue create mode 100644 src/tool/country.js diff --git a/.env.dev b/.env.dev index 4b773b76..7cb5aaab 100644 --- a/.env.dev +++ b/.env.dev @@ -4,7 +4,7 @@ NODE_ENV = 'development' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' -VUE_APP_BASE_URL = 'https://api.aida.com.hk' +# VUE_APP_BASE_URL = 'https://api.aida.com.hk' # 佩佩 # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # 海波 diff --git a/package-lock.json b/package-lock.json index da4af035..cbf81319 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "axios": "^1.4.0", "core-js": "^3.8.3", "driver.js": "^1.3.1", + "echarts": "^5.5.1", "element-plus": "^2.4.2", "file-saver": "^2.0.5", "fingerprintjs2": "^2.1.4", @@ -5475,6 +5476,20 @@ "node": ">=6.0.0" } }, + "node_modules/echarts": { + "version": "5.5.1", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz", + "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.6.0" + } + }, + "node_modules/echarts/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -12449,6 +12464,19 @@ "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz", "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", "dev": true + }, + "node_modules/zrender": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz", + "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==", + "dependencies": { + "tslib": "2.3.0" + } + }, + "node_modules/zrender/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" } }, "dependencies": { @@ -16631,6 +16659,22 @@ "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==", "dev": true }, + "echarts": { + "version": "5.5.1", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz", + "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.6.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -22120,6 +22164,21 @@ "dev": true } } + }, + "zrender": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz", + "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==", + "requires": { + "tslib": "2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } } } } diff --git a/package.json b/package.json index 34c4d6cd..5bea6be9 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "axios": "^1.4.0", "core-js": "^3.8.3", "driver.js": "^1.3.1", + "echarts": "^5.5.1", "element-plus": "^2.4.2", "file-saver": "^2.0.5", "fingerprintjs2": "^2.1.4", diff --git a/src/assets/style/style.css b/src/assets/style/style.css index efdf43dc..889c3a88 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -424,6 +424,9 @@ li { box-shadow: 0 0 0 2px rgba(83, 83, 83, 0.3); border: 1px solid #d9d9d9; } +.ant-picker-suffix { + display: flex; +} .ant-picker-range .ant-picker-active-bar { background: #353535; } @@ -1080,17 +1083,32 @@ li { display: flex; flex-direction: column; } -.admin_page .admin_table_search { - margin-top: 2rem; - padding: 2rem 3.5rem 5rem 2.8rem; - background: #fff; +.admin_page .admin_state_item { + margin-right: 2rem; + margin-bottom: 2rem; display: flex; - justify-content: space-between; + align-items: center; } -.admin_page .admin_table_search .admin_search { - width: 40%; +.admin_page .admin_state_item > span:nth-child(1) { + font-size: 1.6rem; + font-weight: 400; + color: #030303; + margin-right: 15px; + flex-shrink: 0; + display: block; + width: 100px; + text-align: right; } -.admin_page .admin_table_search .admin_search .admin_search_item { +.admin_page .admin_state_item > input { + padding: 4px 11px 4px; + line-height: 1.5715; + font-size: 14px; +} +.admin_page .admin_state_item .active { + cursor: no-drop; + background-color: #f5f5f5; +} +.admin_page .admin_search_item { background: #343579; border-color: #343579; height: 4rem; @@ -1100,27 +1118,48 @@ li { display: inline-block; color: #fff; cursor: pointer; + margin: 0 2rem 2rem 0; +} +.admin_page .admin_search_item:last-child { + margin: 0; +} +.admin_page .admin_table_search { + flex-wrap: wrap; + margin-top: 2rem; + padding: 2rem 3.5rem 5rem 2.8rem; + background: #fff; + display: flex; + justify-content: space-between; +} +.admin_page .admin_table_search .admin_search { + width: 20%; +} +.admin_page .admin_table_search .admin_state_list { + display: flex; + flex-wrap: wrap; + align-items: flex-start; + width: 100%; + margin-top: 2rem; +} +.admin_page .admin_table_search .admin_state_list .admin_state_list_item { + cursor: pointer; + width: auto; + border-radius: 1rem; + padding: 1rem 2rem; + border: 1px solid #b6b6b6; + background: #39215b; + color: #fff; + margin: 0 2rem 2rem 0; + font-size: 1.8rem; + font-weight: 600; +} +.admin_page .admin_table_search .admin_state_list .admin_state_list_item:last-child { + margin: 0; } .admin_page .admin_table_search .admin_state { position: relative; cursor: pointer; - width: 60%; -} -.admin_page .admin_table_search .admin_state .admin_state_item { - margin-right: 2rem; - margin-bottom: 2rem; - display: flex; - align-items: center; -} -.admin_page .admin_table_search .admin_state .admin_state_item > span { - font-size: 1.6rem; - font-weight: 400; - color: #030303; - margin-right: 15px; - flex-shrink: 0; - display: block; - min-width: 13rem; - text-align: right; + width: 80%; } .admin_page .admin_table_search .admin_state .admin_current { background: #fff; @@ -1171,13 +1210,12 @@ li { width: 0 !important; } .admin_page .admin_table_content .ant-table-thead > tr > th { - background: #ffffff00; + background: #ffffff; border-bottom: none; - backdrop-filter: blur(1rem); } .admin_page .admin_table_content .ant-table-tbody > tr > td { border: none; - background: transparent; + background: #fff; } .admin_page .admin_table_content .operate_list { display: flex; @@ -1193,7 +1231,7 @@ li { cursor: pointer; } .admin_page .admin_table_content .ant-table-tbody > tr:hover > td { - background: #ffffff3a; + background: #cacaca; } .admin_page .admin_table_content .ant-table-pagination-right { padding-right: 3.5rem; @@ -1449,7 +1487,8 @@ textarea:focus { .collection_modal_body .input_border, .design_detail_modal_component .input_border, .library_page .input_border, -.productImg_modal .input_border { +.productImg_modal .input_border, +.accountEdit_page .input_border { z-index: 2; display: flex; align-items: center; @@ -1463,7 +1502,8 @@ textarea:focus { .collection_modal_body .input_border .input_box, .design_detail_modal_component .input_border .input_box, .library_page .input_border .input_box, -.productImg_modal .input_border .input_box { +.productImg_modal .input_border .input_box, +.accountEdit_page .input_border .input_box { position: relative; z-index: 2; flex: 1; @@ -1474,7 +1514,8 @@ textarea:focus { .collection_modal_body .input_border .input_box .inputShowText, .design_detail_modal_component .input_border .input_box .inputShowText, .library_page .input_border .input_box .inputShowText, -.productImg_modal .input_border .input_box .inputShowText { +.productImg_modal .input_border .input_box .inputShowText, +.accountEdit_page .input_border .input_box .inputShowText { width: 100%; display: none; } @@ -1482,17 +1523,20 @@ textarea:focus { .design_detail_modal_component .input_border .input_box.active .input_box_btnBox, .library_page .input_border .input_box.active .input_box_btnBox, .productImg_modal .input_border .input_box.active .input_box_btnBox, +.accountEdit_page .input_border .input_box.active .input_box_btnBox, .collection_modal_body .input_border .input_box.active textarea, .design_detail_modal_component .input_border .input_box.active textarea, .library_page .input_border .input_box.active textarea, -.productImg_modal .input_border .input_box.active textarea { +.productImg_modal .input_border .input_box.active textarea, +.accountEdit_page .input_border .input_box.active textarea { border: 1px solid #ff0001; box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); } .collection_modal_body .input_border .input_box.active span, .design_detail_modal_component .input_border .input_box.active span, .library_page .input_border .input_box.active span, -.productImg_modal .input_border .input_box.active span { +.productImg_modal .input_border .input_box.active span, +.accountEdit_page .input_border .input_box.active span { opacity: 1; display: block; color: rgba(255, 0, 0.7); @@ -1500,14 +1544,16 @@ textarea:focus { .collection_modal_body .input_border .search_keyword, .design_detail_modal_component .input_border .search_keyword, .library_page .input_border .search_keyword, -.productImg_modal .input_border .search_keyword { +.productImg_modal .input_border .search_keyword, +.accountEdit_page .input_border .search_keyword { height: 0; flex-basis: 100%; } .collection_modal_body .input_border .search_keyword .search_keyword_center, .design_detail_modal_component .input_border .search_keyword .search_keyword_center, .library_page .input_border .search_keyword .search_keyword_center, -.productImg_modal .input_border .search_keyword .search_keyword_center { +.productImg_modal .input_border .search_keyword .search_keyword_center, +.accountEdit_page .input_border .search_keyword .search_keyword_center { justify-content: space-between; display: flex; width: var(--width); @@ -1524,7 +1570,8 @@ textarea:focus { .collection_modal_body .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left, -.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_left { +.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_left, +.accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left { display: flex; overflow: hidden; flex: 1; @@ -1533,7 +1580,8 @@ textarea:focus { .collection_modal_body .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item, -.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item { +.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item, +.accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item { border-radius: 0.4rem; border: solid 1px #39215b; background-color: #8156bd; @@ -1548,13 +1596,15 @@ textarea:focus { .collection_modal_body .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, -.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child { +.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, +.accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child { margin-right: 0; } .collection_modal_body .input_border .input_box_btnBox, .design_detail_modal_component .input_border .input_box_btnBox, .library_page .input_border .input_box_btnBox, -.productImg_modal .input_border .input_box_btnBox { +.productImg_modal .input_border .input_box_btnBox, +.accountEdit_page .input_border .input_box_btnBox { border: calc(0.1rem*1.2) solid #F1F1F1; width: var(--width); display: flex; @@ -1563,13 +1613,15 @@ textarea:focus { .collection_modal_body .input_border .input_box_btnBox .ant-spin-text, .design_detail_modal_component .input_border .input_box_btnBox .ant-spin-text, .library_page .input_border .input_box_btnBox .ant-spin-text, -.productImg_modal .input_border .input_box_btnBox .ant-spin-text { +.productImg_modal .input_border .input_box_btnBox .ant-spin-text, +.accountEdit_page .input_border .input_box_btnBox .ant-spin-text { font-size: 1.2rem; } .collection_modal_body .input_border .input_box_btnBox .search_seed, .design_detail_modal_component .input_border .input_box_btnBox .search_seed, .library_page .input_border .input_box_btnBox .search_seed, -.productImg_modal .input_border .input_box_btnBox .search_seed { +.productImg_modal .input_border .input_box_btnBox .search_seed, +.accountEdit_page .input_border .input_box_btnBox .search_seed { padding: 0; width: 4rem; text-align: center; @@ -1579,14 +1631,16 @@ textarea:focus { .collection_modal_body .input_border .upload_item .upload_file_item, .design_detail_modal_component .input_border .upload_item .upload_file_item, .library_page .input_border .upload_item .upload_file_item, -.productImg_modal .input_border .upload_item .upload_file_item { +.productImg_modal .input_border .upload_item .upload_file_item, +.accountEdit_page .input_border .upload_item .upload_file_item { width: 8rem; height: 8rem; } .collection_modal_body .input_border input, .design_detail_modal_component .input_border input, .library_page .input_border input, -.productImg_modal .input_border input { +.productImg_modal .input_border input, +.accountEdit_page .input_border input { width: 100%; border-radius: calc(0.5rem*1.2); border: 1px solid rgba(0, 0, 0, 0.15); @@ -1598,37 +1652,43 @@ textarea:focus { .collection_modal_body .input_border inputinput:-moz-placeholder, .design_detail_modal_component .input_border inputinput:-moz-placeholder, .library_page .input_border inputinput:-moz-placeholder, -.productImg_modal .input_border inputinput:-moz-placeholder { +.productImg_modal .input_border inputinput:-moz-placeholder, +.accountEdit_page .input_border inputinput:-moz-placeholder { color: rgba(0, 0, 0, 0.15); } .collection_modal_body .input_border inputinput:-ms-input-placeholder, .design_detail_modal_component .input_border inputinput:-ms-input-placeholder, .library_page .input_border inputinput:-ms-input-placeholder, -.productImg_modal .input_border inputinput:-ms-input-placeholder { +.productImg_modal .input_border inputinput:-ms-input-placeholder, +.accountEdit_page .input_border inputinput:-ms-input-placeholder { color: rgba(0, 0, 0, 0.15); } .collection_modal_body .input_border inputinput::-webkit-input-placeholder, .design_detail_modal_component .input_border inputinput::-webkit-input-placeholder, .library_page .input_border inputinput::-webkit-input-placeholder, -.productImg_modal .input_border inputinput::-webkit-input-placeholder { +.productImg_modal .input_border inputinput::-webkit-input-placeholder, +.accountEdit_page .input_border inputinput::-webkit-input-placeholder { color: rgba(0, 0, 0, 0.15); } .collection_modal_body .input_border input.forbidden, .design_detail_modal_component .input_border input.forbidden, .library_page .input_border input.forbidden, -.productImg_modal .input_border input.forbidden { +.productImg_modal .input_border input.forbidden, +.accountEdit_page .input_border input.forbidden { cursor: no-drop; } .collection_modal_body .input_border .input_box_btnBox_upImg, .design_detail_modal_component .input_border .input_box_btnBox_upImg, .library_page .input_border .input_box_btnBox_upImg, -.productImg_modal .input_border .input_box_btnBox_upImg { +.productImg_modal .input_border .input_box_btnBox_upImg, +.accountEdit_page .input_border .input_box_btnBox_upImg { height: 100%; } .collection_modal_body .input_border .fi, .design_detail_modal_component .input_border .fi, .library_page .input_border .fi, -.productImg_modal .input_border .fi { +.productImg_modal .input_border .fi, +.accountEdit_page .input_border .fi { margin-right: 1rem; display: flex; cursor: pointer; @@ -1643,26 +1703,30 @@ textarea:focus { .collection_modal_body .input_border .fi.fi-br-loading, .design_detail_modal_component .input_border .fi.fi-br-loading, .library_page .input_border .fi.fi-br-loading, -.productImg_modal .input_border .fi.fi-br-loading { +.productImg_modal .input_border .fi.fi-br-loading, +.accountEdit_page .input_border .fi.fi-br-loading { height: 100%; background-color: rgba(0, 0, 0, 0); } .collection_modal_body .input_border .fi.active, .design_detail_modal_component .input_border .fi.active, .library_page .input_border .fi.active, -.productImg_modal .input_border .fi.active { +.productImg_modal .input_border .fi.active, +.accountEdit_page .input_border .fi.active { transform: rotate(180deg); } .collection_modal_body .input_border .fi.forbidden, .design_detail_modal_component .input_border .fi.forbidden, .library_page .input_border .fi.forbidden, -.productImg_modal .input_border .fi.forbidden { +.productImg_modal .input_border .fi.forbidden, +.accountEdit_page .input_border .fi.forbidden { cursor: no-drop; } .collection_modal_body .input_border .search_upImg, .design_detail_modal_component .input_border .search_upImg, .library_page .input_border .search_upImg, -.productImg_modal .input_border .search_upImg { +.productImg_modal .input_border .search_upImg, +.accountEdit_page .input_border .search_upImg { width: 4rem; height: 100%; position: absolute; @@ -1672,14 +1736,16 @@ textarea:focus { .collection_modal_body .input_border .search_upImg span, .design_detail_modal_component .input_border .search_upImg span, .library_page .input_border .search_upImg span, -.productImg_modal .input_border .search_upImg span { +.productImg_modal .input_border .search_upImg span, +.accountEdit_page .input_border .search_upImg span { position: absolute; width: 100%; } .collection_modal_body .input_border .search_upImg .ant-upload-select-picture-card, .design_detail_modal_component .input_border .search_upImg .ant-upload-select-picture-card, .library_page .input_border .search_upImg .ant-upload-select-picture-card, -.productImg_modal .input_border .search_upImg .ant-upload-select-picture-card { +.productImg_modal .input_border .search_upImg .ant-upload-select-picture-card, +.accountEdit_page .input_border .search_upImg .ant-upload-select-picture-card { width: 100%; height: 100%; display: block !important; @@ -1687,7 +1753,8 @@ textarea:focus { .collection_modal_body .input_border .search_textarea, .design_detail_modal_component .input_border .search_textarea, .library_page .input_border .search_textarea, -.productImg_modal .input_border .search_textarea { +.productImg_modal .input_border .search_textarea, +.accountEdit_page .input_border .search_textarea { z-index: 3; height: auto; position: absolute; @@ -1702,20 +1769,23 @@ textarea:focus { .collection_modal_body .input_border .generage_btn, .design_detail_modal_component .input_border .generage_btn, .library_page .input_border .generage_btn, -.productImg_modal .input_border .generage_btn { +.productImg_modal .input_border .generage_btn, +.accountEdit_page .input_border .generage_btn { margin-left: 2rem; } .collection_modal_body .upload_item, .design_detail_modal_component .upload_item, .library_page .upload_item, -.productImg_modal .upload_item { +.productImg_modal .upload_item, +.accountEdit_page .upload_item { display: flex; flex-wrap: wrap; } .collection_modal_body .upload_item .upload_file_item, .design_detail_modal_component .upload_item .upload_file_item, .library_page .upload_item .upload_file_item, -.productImg_modal .upload_item .upload_file_item { +.productImg_modal .upload_item .upload_file_item, +.accountEdit_page .upload_item .upload_file_item { margin: 0 calc(2rem*1.2) calc(2rem*1.2) 0; display: inline-block; width: calc(10rem*1.2); @@ -1728,7 +1798,8 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item.active, .design_detail_modal_component .upload_item .upload_file_item.active, .library_page .upload_item .upload_file_item.active, -.productImg_modal .upload_item .upload_file_item.active { +.productImg_modal .upload_item .upload_file_item.active, +.accountEdit_page .upload_item .upload_file_item.active { opacity: 0.5; border-radius: calc(1rem*1.2); transform: scale(0.9); @@ -1736,19 +1807,22 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item.active .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item.active .delete_file_block, .library_page .upload_item .upload_file_item.active .delete_file_block, -.productImg_modal .upload_item .upload_file_item.active .delete_file_block { +.productImg_modal .upload_item .upload_file_item.active .delete_file_block, +.accountEdit_page .upload_item .upload_file_item.active .delete_file_block { pointer-events: none; } .collection_modal_body .upload_item .upload_file_item.active .operate_file_block, .design_detail_modal_component .upload_item .upload_file_item.active .operate_file_block, .library_page .upload_item .upload_file_item.active .operate_file_block, -.productImg_modal .upload_item .upload_file_item.active .operate_file_block { +.productImg_modal .upload_item .upload_file_item.active .operate_file_block, +.accountEdit_page .upload_item .upload_file_item.active .operate_file_block { pointer-events: none; } .collection_modal_body .upload_item .upload_file_item.upload_component, .design_detail_modal_component .upload_item .upload_file_item.upload_component, .library_page .upload_item .upload_file_item.upload_component, -.productImg_modal .upload_item .upload_file_item.upload_component { +.productImg_modal .upload_item .upload_file_item.upload_component, +.accountEdit_page .upload_item .upload_file_item.upload_component { border: none; display: flex; align-items: center; @@ -1757,8 +1831,10 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), .design_detail_modal_component .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), .library_page .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), -.productImg_modal .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper) { +.productImg_modal .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), +.accountEdit_page .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper) { position: absolute; + width: auto; top: 50%; left: 50%; transform: translate(-50%, -50%); @@ -1766,7 +1842,8 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), .design_detail_modal_component .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), .library_page .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), -.productImg_modal .upload_item .upload_file_item :deep(.ant-upload-select-picture-card) { +.productImg_modal .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), +.accountEdit_page .upload_item .upload_file_item :deep(.ant-upload-select-picture-card) { width: calc(6rem*1.2); height: calc(6rem*1.2); border: calc(0.3rem*1.2) solid #ededed; @@ -1776,7 +1853,8 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item .upload_file_item_content, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content, .library_page .upload_item .upload_file_item .upload_file_item_content, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content { display: flex; align-items: center; justify-content: center; @@ -1787,19 +1865,22 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item .upload_file_item_content:hover div, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover div, .library_page .upload_item .upload_file_item .upload_file_item_content:hover div, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover div { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover div, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content:hover div { opacity: 1; } .collection_modal_body .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .library_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block { display: block; } .collection_modal_body .upload_item .upload_file_item .upload_file_item_content .upload_img, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .upload_img, .library_page .upload_item .upload_file_item .upload_file_item_content .upload_img, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content .upload_img { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content .upload_img, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .upload_img { display: block; height: 100%; width: auto; @@ -1809,7 +1890,8 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item .upload_file_item_content .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block, .library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block { display: none; width: 100%; cursor: pointer; @@ -1826,7 +1908,8 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, .library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop { width: calc(3.2rem*1.2); height: calc(3.2rem*1.2); background: rgba(0, 0, 0, 0.6); @@ -1841,20 +1924,23 @@ textarea:focus { .collection_modal_body .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, .library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, -.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu { +.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, +.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu { font-size: calc(1.6rem*1.2); color: #fff; } .collection_modal_body .upload_item .upload_file_item .upload_img_icon, .design_detail_modal_component .upload_item .upload_file_item .upload_img_icon, .library_page .upload_item .upload_file_item .upload_img_icon, -.productImg_modal .upload_item .upload_file_item .upload_img_icon { +.productImg_modal .upload_item .upload_file_item .upload_img_icon, +.accountEdit_page .upload_item .upload_file_item .upload_img_icon { width: calc(4.6rem*1.2); } .collection_modal_body .upload_item .upload_file_item:last-child, .design_detail_modal_component .upload_item .upload_file_item:last-child, .library_page .upload_item .upload_file_item:last-child, -.productImg_modal .upload_item .upload_file_item:last-child { +.productImg_modal .upload_item .upload_file_item:last-child, +.accountEdit_page .upload_item .upload_file_item:last-child { margin: 0; } .generalModel_modal .ant-modal-content { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 1a8ffd38..12b60c28 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -473,6 +473,9 @@ input:focus{ box-shadow: 0 0 0 2px rgba(83, 83, 83, 0.3); border: 1px solid #d9d9d9; } +.ant-picker-suffix{ + display: flex; +} .ant-picker-range .ant-picker-active-bar{ background: #353535; } @@ -1208,47 +1211,87 @@ input:focus{ position: relative; display: flex; flex-direction: column; + .admin_state_item{ + margin-right: 2rem; + margin-bottom: 2rem; + display: flex; + align-items: center; + >span:nth-child(1){ + font-size: 1.6rem; + font-weight: 400; + color: #030303; + margin-right: 15px; + flex-shrink: 0; + display: block; + // min-width: 20%; + width: 100px; + text-align: right; + } + >input{ + padding: 4px 11px 4px; + line-height: 1.5715; + font-size: 14px; + } + .active{ + cursor: no-drop; + background-color: #f5f5f5; + } + } + .admin_search_item{ + background: #343579; + border-color: #343579; + height: 4rem; + padding: .64rem 1.5rem; + font-size: 1.6rem; + border-radius: 2px; + display: inline-block; + color: #fff; + cursor: pointer; + margin: 0 2rem 2rem 0; + } + .admin_search_item:last-child{ + margin: 0; + } .admin_table_search { display: flex; + flex-wrap: wrap; margin-top: 2rem; padding: 2rem 3.5rem 5rem 2.8rem; background: #fff; display: flex; justify-content: space-between; .admin_search{ - width: 40%; - .admin_search_item{ - background: #343579; - border-color: #343579; - height: 4rem; - padding: .64rem 1.5rem; - font-size: 1.6rem; - border-radius: 2px; - display: inline-block; - color: #fff; + width: 20%; + + } + .admin_state_list{ + display: flex; + flex-wrap: wrap; + align-items: flex-start; + width: 100%; + margin-top: 2rem; + .admin_state_list_item{ cursor: pointer; + width: auto; + border-radius: 1rem; + padding: 1rem 2rem; + border: 1px solid #b6b6b6; + background: #39215b; + color: #fff; + margin: 0 2rem 2rem 0; + font-size: 1.8rem; + font-weight: 600; + } + .admin_state_list_item:last-child{ + margin: 0; } } .admin_state { position: relative; cursor: pointer; - width: 60%; - .admin_state_item{ - margin-right: 2rem; - margin-bottom: 2rem; - display: flex; - align-items: center; - >span{ - font-size: 1.6rem; - font-weight: 400; - color: #030303; - margin-right: 15px; - flex-shrink: 0; - display: block; - min-width: 13rem; - text-align: right; - } - } + width: 80%; + + .admin_current{ background: #fff; width: 100%; @@ -1302,14 +1345,14 @@ input:focus{ } } .ant-table-thead > tr > th { - background: #ffffff00; + background: #ffffff; border-bottom: none; - backdrop-filter: blur(1rem); + // backdrop-filter: blur(1rem); } .ant-table-tbody > tr > td { border: none; - background: transparent; + background: #fff; // color: #fff; } .operate_list{ @@ -1328,7 +1371,7 @@ input:focus{ } .ant-table-tbody > tr { &:hover > td { - background: #ffffff3a; + background: rgb(202, 202, 202) } } .ant-table-pagination-right { @@ -1530,7 +1573,7 @@ textarea:focus{ outline: none; /* 清除默认焦点样式 */ } //设计input和上传按钮样式 -.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_modal{ +.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_modal,.accountEdit_page{ .input_border{ z-index: 2; display: flex; @@ -1758,6 +1801,7 @@ textarea:focus{ } :deep(.ant-upload-picture-card-wrapper) { position: absolute; + width: auto; top: 50%; left: 50%; transform: translate(-50%, -50%); diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue index 5be5d2b3..02ad7abf 100644 --- a/src/component/Administrator/TestClickData.vue +++ b/src/component/Administrator/TestClickData.vue @@ -4,8 +4,9 @@
- State Time: + Start Date: - End Time: - + Start Time: +
@@ -177,24 +178,6 @@ export default defineComponent({ ]; }); - let state:any = ref([ - { - name:'all', - value:'', - }, - { - name:'unprocessed', - value:0, - }, - { - name:'pending', - value:1, - }, - { - name:'rejected', - value:2, - }, - ]) let dataList: any = ref([]); let status: any = ref(0); return { @@ -204,7 +187,6 @@ export default defineComponent({ dataList, renameData, status, - state, }; }, data() { @@ -292,6 +274,3 @@ export default defineComponent({ }, }); - \ No newline at end of file diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index aa7cd474..ea8e96b6 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -1,224 +1,510 @@ - \ No newline at end of file diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue new file mode 100644 index 00000000..1f49e3e6 --- /dev/null +++ b/src/component/Administrator/allUserPoerations.vue @@ -0,0 +1,302 @@ + + + + \ No newline at end of file diff --git a/src/component/Administrator/recentActiveChart.vue b/src/component/Administrator/recentActiveChart.vue new file mode 100644 index 00000000..77e40fb4 --- /dev/null +++ b/src/component/Administrator/recentActiveChart.vue @@ -0,0 +1,227 @@ + + diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue new file mode 100644 index 00000000..6675da2a --- /dev/null +++ b/src/component/Administrator/recentActiveUser.vue @@ -0,0 +1,303 @@ + + diff --git a/src/component/Administrator/recentActiveUserChart.vue b/src/component/Administrator/recentActiveUserChart.vue new file mode 100644 index 00000000..3ba73507 --- /dev/null +++ b/src/component/Administrator/recentActiveUserChart.vue @@ -0,0 +1,195 @@ + + diff --git a/src/component/Administrator/recentNewUser.vue b/src/component/Administrator/recentNewUser.vue new file mode 100644 index 00000000..164ad429 --- /dev/null +++ b/src/component/Administrator/recentNewUser.vue @@ -0,0 +1,320 @@ + + diff --git a/src/component/Administrator/recentNewUserChart.vue b/src/component/Administrator/recentNewUserChart.vue new file mode 100644 index 00000000..00395414 --- /dev/null +++ b/src/component/Administrator/recentNewUserChart.vue @@ -0,0 +1,223 @@ + + diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue new file mode 100644 index 00000000..34e15932 --- /dev/null +++ b/src/component/Administrator/trialAllUser.vue @@ -0,0 +1,310 @@ + + + + \ No newline at end of file diff --git a/src/component/Administrator/trialApproval.vue b/src/component/Administrator/trialApproval.vue index d063a272..efaa0d22 100644 --- a/src/component/Administrator/trialApproval.vue +++ b/src/component/Administrator/trialApproval.vue @@ -16,7 +16,7 @@ -
+
- \ No newline at end of file diff --git a/src/component/Administrator/trialUserConversionRateChart.vue b/src/component/Administrator/trialUserConversionRateChart.vue new file mode 100644 index 00000000..71e6fd42 --- /dev/null +++ b/src/component/Administrator/trialUserConversionRateChart.vue @@ -0,0 +1,158 @@ + + diff --git a/src/component/Administrator/trialUserCountry.vue b/src/component/Administrator/trialUserCountry.vue new file mode 100644 index 00000000..191b434c --- /dev/null +++ b/src/component/Administrator/trialUserCountry.vue @@ -0,0 +1,152 @@ + + diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 1782b138..63d1eac1 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -813,6 +813,7 @@ export default defineComponent({ // this.store.commit("setTemplateData", event); // }, async setWorkspaceStyle(data: any){ + // this.workspaceItem.styleId = data.id this.workspaceItem.styleName = data.name this.workspaceItem.style = data.value @@ -820,6 +821,9 @@ export default defineComponent({ if(data.isRevampModel){ await this.getMannequins(true) } + if(!this.workspaceItem.overallSingle){ + this.workspaceItem.position = 'Overall' + } this.putWorkspace(this.workspaceItem,this.workspaceItem.id) }, setStyle(){ diff --git a/src/router/index.ts b/src/router/index.ts index ad08b5f6..5c64c305 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -140,6 +140,38 @@ const routes: Array = [ path:'questionnaire', name:'questionnaire', component: _import_component('Administrator/questionnaire.vue'), + },{ + path:'recentActiveChart', + name:'recentActiveChart', + component: _import_component('Administrator/recentActiveChart.vue'), + },{ + path:'recentActiveUser', + name:'recentActiveUser', + component: _import_component('Administrator/recentActiveUser.vue'), + },{ + path:'recentActiveUserChart', + name:'recentActiveUserChart', + component: _import_component('Administrator/recentActiveUserChart.vue'), + },{ + path:'recentNewUser', + name:'recentNewUser', + component: _import_component('Administrator/recentNewUser.vue'), + },{ + path:'recentNewUserChart', + name:'recentNewUserChart', + component: _import_component('Administrator/recentNewUserChart.vue'), + },{ + path:'trialUserCountry', + name:'trialUserCountry', + component: _import_component('Administrator/trialUserCountry.vue'), + },{ + path:'trialUserConversionRateChart', + name:'trialUserConversionRateChart', + component: _import_component('Administrator/trialUserConversionRateChart.vue'), + },{ + path:'trialAllUser', + name:'trialAllUser', + component: _import_component('Administrator/trialAllUser.vue'), }, ] }, diff --git a/src/tool/country.js b/src/tool/country.js new file mode 100644 index 00000000..0816fe40 --- /dev/null +++ b/src/tool/country.js @@ -0,0 +1,663 @@ +let country = [ + { + label: "Albania", + value: "Albania" + }, + { + label: "Algeria", + value: "Algeria" + }, + { + label: "Andorra", + value: "Andorra" + }, + { + label: "Angola", + value: "Angola" + }, + { + label: "Antigua and Barbuda", + value: "Antigua and Barbuda" + }, + { + label: "Argentina", + value: "Argentina" + }, + { + label: "Armenia", + value: "Armenia" + }, + { + label: "Australia", + value: "Australia" + }, + { + label: "Austria", + value: "Austria" + }, + { + label: "Azerbaijan", + value: "Azerbaijan" + }, + { + label: "Bahamas", + value: "Bahamas" + }, + { + label: "Bangladesh", + value: "Bangladesh" + }, + { + label: "Barbados", + value: "Barbados" + }, + { + label: "Belgium", + value: "Belgium" + }, + { + label: "Belize", + value: "Belize" + }, + { + label: "Benin", + value: "Benin" + }, + { + label: "Bhutan", + value: "Bhutan" + }, + { + label: "Bolivia", + value: "Bolivia" + }, + { + label: "Bosnia and Herzegovina", + value: "Bosnia and Herzegovina" + }, + { + label: "Botswana", + value: "Botswana" + }, + { + label: "Brazil", + value: "Brazil" + }, + { + label: "Brunei", + value: "Brunei" + }, + { + label: "Bulgaria", + value: "Bulgaria" + }, + { + label: "Burkina Faso", + value: "Burkina Faso" + }, + { + label: "Cabo Verde", + value: "Cabo Verde" + }, + { + label: "Canada", + value: "Canada" + }, + { + label: "China", + value: "China" + }, + { + label: "Chile", + value: "Chile" + }, + { + label: "Colombia", + value: "Colombia" + }, + { + label: "Comoros", + value: "Comoros" + }, + { + label: "Congo", + value: "Congo" + }, + { + label: "Costa Rica", + value: "Costa Rica" + }, + { + label: "Côte d'Ivoire", + value: "Côte d'Ivoire" + }, + { + label: "Croatia", + value: "Croatia" + }, + { + label: "Cyprus", + value: "Cyprus" + }, + { + label: "Czech Republic", + value: "Czech Republic" + }, + { + label: "Denmark", + value: "Denmark" + }, + { + label: "Djibouti", + value: "Djibouti" + }, + { + label: "Dominica", + value: "Dominica" + }, + { + label: "Dominican Republic", + value: "Dominican Republic" + }, + { + label: "Ecuador", + value: "Ecuador" + }, + { + label: "El Salvador", + value: "El Salvador" + }, + { + label: "Estonia", + value: "Estonia" + }, + { + label: "Fiji", + value: "Fiji" + }, + { + label: "Finland", + value: "Finland" + }, + { + label: "France", + value: "France" + }, + { + label: "Gabon", + value: "Gabon" + }, + { + label: "Gambia", + value: "Gambia" + }, + { + label: "Georgia", + value: "Georgia" + }, + { + label: "Germany", + value: "Germany" + }, + { + label: "Ghana", + value: "Ghana" + }, + { + label: "Greece", + value: "Greece" + }, + { + label: "Grenada", + value: "Grenada" + }, + { + label: "Guatemala", + value: "Guatemala" + }, + { + label: "Guinea", + value: "Guinea" + }, + { + label: "Guinea-Bissau", + value: "Guinea-Bissau" + }, + { + label: "Guyana", + value: "Guyana" + }, + { + label: "Haiti", + value: "Haiti" + }, + { + label: "Holy See", + value: "Holy See" + }, + { + label: "Honduras", + value: "Honduras" + }, + { + label: "Hong Kong, China", + value: "Hong Kong, China" + }, + { + label: "Hungary", + value: "Hungary" + }, + { + label: "Iceland", + value: "Iceland" + }, + { + label: "India", + value: "India" + }, + { + label: "Indonesia", + value: "Indonesia" + }, + { + label: "Iraq", + value: "Iraq" + }, + { + label: "Ireland", + value: "Ireland" + }, + { + label: "Israel", + value: "Israel" + }, + { + label: "Italy", + value: "Italy" + }, + { + label: "Jamaica", + value: "Jamaica" + }, + { + label: "Japan", + value: "Japan" + }, + { + label: "Jordan", + value: "Jordan" + }, + { + label: "Kazakhstan", + value: "Kazakhstan" + }, + { + label: "Kenya", + value: "Kenya" + }, + { + label: "Kiribati", + value: "Kiribati" + }, + { + label: "Kuwait", + value: "Kuwait" + }, + { + label: "Kyrgyzstan", + value: "Kyrgyzstan" + }, + { + label: "Latvia", + value: "Latvia" + }, + { + label: "Lebanon", + value: "Lebanon" + }, + { + label: "Lesotho", + value: "Lesotho" + }, + { + label: "Liberia", + value: "Liberia" + }, + { + label: "Liechtenstein", + value: "Liechtenstein" + }, + { + label: "Lithuania", + value: "Lithuania" + }, + { + label: "Luxembourg", + value: "Luxembourg" + }, + { + label: "Madagascar", + value: "Madagascar" + }, + { + label: "Malawi", + value: "Malawi" + }, + { + label: "Malaysia", + value: "Malaysia" + }, + { + label: "Maldives", + value: "Maldives" + }, + { + label: "Mali", + value: "Mali" + }, + { + label: "Malta", + value: "Malta" + }, + { + label: "Marshall Islands", + value: "Marshall Islands" + }, + { + label: "Mauritania", + value: "Mauritania" + }, + { + label: "Mauritius", + value: "Mauritius" + }, + { + label: "Mexico", + value: "Mexico" + }, + { + label: "Micronesia", + value: "Micronesia" + }, + { + label: "Moldova", + value: "Moldova" + }, + { + label: "Monaco", + value: "Monaco" + }, + { + label: "Mongolia", + value: "Mongolia" + }, + { + label: "Montenegro", + value: "Montenegro" + }, + { + label: "Morocco", + value: "Morocco" + }, + { + label: "Mozambique", + value: "Mozambique" + }, + { + label: "Myanmar", + value: "Myanmar" + }, + { + label: "Namibia", + value: "Namibia" + }, + { + label: "Nauru", + value: "Nauru" + }, + { + label: "Nepal", + value: "Nepal" + }, + { + label: "Netherlands", + value: "Netherlands" + }, + { + label: "New Zealand", + value: "New Zealand" + }, + { + label: "Nicaragua", + value: "Nicaragua" + }, + { + label: "Niger", + value: "Niger" + }, + { + label: "Nigeria", + value: "Nigeria" + }, + { + label: "North Macedonia", + value: "North Macedonia" + }, + { + label: "Norway", + value: "Norway" + }, + { + label: "Oman", + value: "Oman" + }, + { + label: "Pakistan", + value: "Pakistan" + }, + { + label: "Palau", + value: "Palau" + }, + { + label: "Palestine", + value: "Palestine" + }, + { + label: "Panama", + value: "Panama" + }, + { + label: "Papua New Guinea", + value: "Papua New Guinea" + }, + { + label: "Paraguay", + value: "Paraguay" + }, + { + label: "Peru", + value: "Peru" + }, + { + label: "Philippines", + value: "Philippines" + }, + { + label: "Poland", + value: "Poland" + }, + { + label: "Portugal", + value: "Portugal" + }, + { + label: "Qatar", + value: "Qatar" + }, + { + label: "Romania", + value: "Romania" + }, + { + label: "Rwanda", + value: "Rwanda" + }, + { + label: "Saint Kitts and Nevis", + value: "Saint Kitts and Nevis" + }, + { + label: "Saint Lucia", + value: "Saint Lucia" + }, + { + label: "Saint Vincent and the Grenadines", + value: "Saint Vincent and the Grenadines" + }, + { + label: "Samoa", + value: "Samoa" + }, + { + label: "San Marino", + value: "San Marino" + }, + { + label: "Sao Tome and Principe", + value: "Sao Tome and Principe" + }, + { + label: "Senegal", + value: "Senegal" + }, + { + label: "Serbia", + value: "Serbia" + }, + { + label: "Seychelles", + value: "Seychelles" + }, + { + label: "Sierra Leone", + value: "Sierra Leone" + }, + { + label: "Singapore", + value: "Singapore" + }, + { + label: "Slovakia", + value: "Slovakia" + }, + { + label: "Slovenia", + value: "Slovenia" + }, + { + label: "Solomon Islands", + value: "Solomon Islands" + }, + { + label: "South Africa", + value: "South Africa" + }, + { + label: "South Korea", + value: "South Korea" + }, + { + label: "Spain", + value: "Spain" + }, + { + label: "Sri Lanka", + value: "Sri Lanka" + }, + { + label: "Suriname", + value: "Suriname" + }, + { + label: "Sweden", + value: "Sweden" + }, + { + label: "Switzerland", + value: "Switzerland" + }, + { + label: "Taiwan, China", + value: "Taiwan, China" + }, + { + label: "Tanzania", + value: "Tanzania" + }, + { + label: "Thailand", + value: "Thailand" + }, + { + label: "Timor-Leste", + value: "Timor-Leste" + }, + { + label: "Togo", + value: "Togo" + }, + { + label: "Tonga", + value: "Tonga" + }, + { + label: "Trinidad and Tobago", + value: "Trinidad and Tobago" + }, + { + label: "Tunisia", + value: "Tunisia" + }, + { + label: "Turkey", + value: "Turkey" + }, + { + label: "Tuvalu", + value: "Tuvalu" + }, + { + label: "Uganda", + value: "Uganda" + }, + { + label: "Ukraine", + value: "Ukraine" + }, + { + label: "United Arab Emirates", + value: "United Arab Emirates" + }, + { + label: "United Kingdom", + value: "United Kingdom" + }, + { + label: "United States of America", + value: "United States of America" + }, + { + label: "Uruguay", + value: "Uruguay" + }, + { + label: "Vanuatu", + value: "Vanuatu" + }, + { + label: "Zambia", + value: "Zambia" + } +] +export {country} \ No newline at end of file diff --git a/src/tool/https.js b/src/tool/https.js index 574e6c99..d7c6be83 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -235,11 +235,22 @@ export const Https = { //管理员接口 //查询所有试用用户 - inquiryGetTrial:`/api/inquiry/getTrial`,//拒绝审批 + inquiryGetTrial:`/api/inquiry/getTrial`,//查询所有试用用户 + getUserInfo:`/api/inquiry/getUserInfo`,//查询所有用户 //查询某个时间内design点击次数 getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批 getAllQuestionnaire:`/api/inquiry/getAllQuestionnaire`,//拒绝审批 - + getActiveUserFunc:`/api/inquiry/getActiveUserFunc`,//获取各模块功能 + recentActiveUser:`/api/inquiry/recentActiveUser`,//获取近期活跃用户 + recentActiveUserChart:`/api/inquiry/recentActiveUserChart`,//获取近期活跃用户图表数据 + recentNewUser:`/api/inquiry/recentNewUser`,//获取近期新增用户 + recentNewUserChart:`/api/inquiry/recentNewUserChart`,//获取新增用户图表 + trialUserCountry:`/api/inquiry/trialUserCountry`,//试用用户国家-城市分布 + conversionRate:`/api/inquiry/conversionRate`,//试用用户国家-城市分布 + getAllUserId:`/api/inquiry/getAllUserId`,//获取所有用户id和Name + adminAddUser:`/api/inquiry/addUser`,//添加用户 + modifyUser:`/api/inquiry/modifyUser`,//修改用户 + getTasksList:`/api/tasks/getList`,//获取w为执行完的所有任务 getTasksHistory:`/api/tasks/getAllTask`,//获取所有任务列表 diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue index ac018c26..5fa08fa7 100644 --- a/src/views/Administrator.vue +++ b/src/views/Administrator.vue @@ -18,7 +18,7 @@ @click="handleClick" > -
+