From 82a05c48133aa34fb78afcf5481a35b4e133e5cf Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 29 Jul 2024 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7?= 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 | 30 +++ src/assets/style/style.less | 32 ++- src/component/Administrator/TestClickData.vue | 3 - .../administratorEcharts copy.vue | 173 +++++++++++++++ src/component/Administrator/allUser.vue | 69 +----- src/component/Administrator/questionnaire.vue | 197 ++++++++++++++++++ src/component/Administrator/trialApproval.vue | 5 +- src/component/Detail/DesignDetail.vue | 9 +- src/component/Detail/habit.vue | 21 +- src/router/index.ts | 10 +- src/tool/https.js | 3 + src/views/Administrator.vue | 101 +++++++-- src/views/HomeMain.vue | 182 ++++++++++++++-- src/views/feedbackSurvey.vue | 144 +++++++++++-- src/views/feedbackSurveyCN.vue | 5 +- 18 files changed, 897 insertions(+), 149 deletions(-) create mode 100644 src/component/Administrator/administratorEcharts copy.vue create mode 100644 src/component/Administrator/questionnaire.vue diff --git a/.env.dev b/.env.dev index 7cb5aaab..c8f7d099 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/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 a2775b2d..efdf43dc 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -480,6 +480,22 @@ li { width: 0.8rem; height: 0.8rem; } +.trial_page .ant-tooltip { + z-index: 1049 !important; +} +.trial_page .habit :deep(.ant-tooltip .ant-tooltip-inner), +.trial_page :deep(.ant-tooltip-arrow-content) { + background: #000 !important; +} +.trial_page .habit_mod { + background-color: #000 !important; + /* top: 0 !important; */ + /* left: 0 !important; */ +} +.trial_page .ant-tooltip .ant-tooltip-inner, +.trial_page .ant-tooltip-arrow-content { + background: #000 !important; +} .trial_page .ant-cascader-checkbox-checked .ant-cascader-checkbox-inner { background-color: #767676; border-color: #d9d9d9 !important; @@ -1163,6 +1179,19 @@ li { border: none; background: transparent; } +.admin_page .admin_table_content .operate_list { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 1rem; +} +.admin_page .admin_table_content .operate_list .operate_item { + font-size: 1.4rem; + font-family: Roboto; + font-weight: 400; + color: #343579; + cursor: pointer; +} .admin_page .admin_table_content .ant-table-tbody > tr:hover > td { background: #ffffff3a; } @@ -1174,6 +1203,7 @@ li { align-items: center; justify-content: space-between; padding: 0 1rem; + justify-content: center; } .admin_page .admin_table_content .operate_list .operate_item { font-size: 1.4rem; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 1890dc36..1a8ffd38 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -536,6 +536,22 @@ input:focus{ } } + +.ant-tooltip{ + z-index: 1049 !important; +} +.habit :deep(.ant-tooltip .ant-tooltip-inner) ,:deep(.ant-tooltip-arrow-content){ + background: #000 !important; +} +.habit_mod{ + background-color: #000 !important; + /* top: 0 !important; */ + /* left: 0 !important; */ +} +.ant-tooltip .ant-tooltip-inner ,.ant-tooltip-arrow-content{ + background: #000 !important; +} + .ant-cascader-checkbox-checked .ant-cascader-checkbox-inner{ background-color: #767676; border-color: #d9d9d9 !important; @@ -1296,6 +1312,20 @@ input:focus{ background: transparent; // color: #fff; } + .operate_list{ + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 1rem; + + .operate_item{ + font-size: 1.4rem; + font-family: Roboto; + font-weight: 400; + color: #343579; + cursor: pointer; + } + } .ant-table-tbody > tr { &:hover > td { background: #ffffff3a; @@ -1309,7 +1339,7 @@ input:focus{ align-items: center; justify-content: space-between; padding: 0 1rem; - + justify-content: center; .operate_item { font-size: 1.4rem; font-family: Roboto; diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue index 5be5d2b3..9bf32723 100644 --- a/src/component/Administrator/TestClickData.vue +++ b/src/component/Administrator/TestClickData.vue @@ -292,6 +292,3 @@ export default defineComponent({ }, }); - \ No newline at end of file diff --git a/src/component/Administrator/administratorEcharts copy.vue b/src/component/Administrator/administratorEcharts copy.vue new file mode 100644 index 00000000..f8c494a8 --- /dev/null +++ b/src/component/Administrator/administratorEcharts copy.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index aa7cd474..f6e72a7b 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -3,7 +3,7 @@ -
+
- \ No newline at end of file + \ No newline at end of file diff --git a/src/component/Administrator/questionnaire.vue b/src/component/Administrator/questionnaire.vue new file mode 100644 index 00000000..4d32a0a9 --- /dev/null +++ b/src/component/Administrator/questionnaire.vue @@ -0,0 +1,197 @@ + + + diff --git a/src/component/Administrator/trialApproval.vue b/src/component/Administrator/trialApproval.vue index d063a272..3fda9309 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/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 13bf3405..fd95db46 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -1156,7 +1156,9 @@ export default defineComponent({ .design_detail_modal_component{ color: #000; // max-width: 1440px ; - + .mark_loading{ + position: absolute; + } .ant-modal-content{ border-radius: calc(1rem*1.2); // overflow: hidden; @@ -1713,9 +1715,6 @@ export default defineComponent({ \ No newline at end of file diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 2840c04c..6a792084 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -907,6 +907,7 @@ export default defineComponent({ margin-top: calc(1.5rem*1.2); cursor: pointer; position: relative; + .habit_workspace_show{ width: 100%; z-index: 1; @@ -1159,21 +1160,9 @@ export default defineComponent({ align-items: center; justify-content: space-between; font-size: calc(1.4rem*1.2); -} - - \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 37389753..ad08b5f6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -117,6 +117,11 @@ const routes: Array = [ name: 'administrator', component: _import('Administrator'), children:[ + { + path: "", + name:'adminChil', + redirect: "/administrator/allUser" + }, { path:'allUser', name:'allUser', @@ -131,6 +136,10 @@ const routes: Array = [ path:'trialApproval', name:'trialApproval', component: _import_component('Administrator/trialApproval.vue'), + },{ + path:'questionnaire', + name:'questionnaire', + component: _import_component('Administrator/questionnaire.vue'), }, ] }, @@ -234,7 +243,6 @@ router.beforeEach((to, from, next) => { let sSystemUser = false for (let index = 0; index < isSystemUserRouteList.length; index++) { if(to.path.indexOf(isSystemUserRouteList[index]) > -1){ - sSystemUser = true break } diff --git a/src/tool/https.js b/src/tool/https.js index 0ffb96f8..574e6c99 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -233,10 +233,13 @@ export const Https = { trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批 trialOrderRefuse:`/api/account/trialOrderRefuse`,//拒绝审批 + //管理员接口 //查询所有试用用户 inquiryGetTrial:`/api/inquiry/getTrial`,//拒绝审批 //查询某个时间内design点击次数 getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批 + getAllQuestionnaire:`/api/inquiry/getAllQuestionnaire`,//拒绝审批 + getTasksList:`/api/tasks/getList`,//获取w为执行完的所有任务 getTasksHistory:`/api/tasks/getAllTask`,//获取所有任务列表 diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue index b4064d6b..6b17a177 100644 --- a/src/views/Administrator.vue +++ b/src/views/Administrator.vue @@ -1,6 +1,12 @@