From 2072e6d0d20297f0c92ee494206b782bc1df43fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com> Date: Sat, 16 Dec 2023 10:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=B4=E6=92=AD=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 1 + package.json | 232 +++++++------- src/api/index.js | 34 ++- src/assets/styles/index.scss | 3 + src/components/Echarts/LineChart.vue | 104 +++++++ src/views/DMPTesting/index.vue | 43 ++- src/views/nested/menu1/index.vue | 3 - src/views/nested/menu1/menu1-1/index.vue | 5 - src/views/nested/menu1/menu1-2/index.vue | 5 - src/views/nested/menu2/index.vue | 5 - .../streamingDetection/detectionTask.vue | 282 ++++++++++++++++++ .../streamingDetection/effectStatistics.vue | 215 +++++++++++++ 12 files changed, 788 insertions(+), 144 deletions(-) create mode 100644 src/components/Echarts/LineChart.vue delete mode 100644 src/views/nested/menu1/index.vue delete mode 100644 src/views/nested/menu1/menu1-1/index.vue delete mode 100644 src/views/nested/menu1/menu1-2/index.vue delete mode 100644 src/views/nested/menu2/index.vue create mode 100644 src/views/streamingDetection/detectionTask.vue create mode 100644 src/views/streamingDetection/effectStatistics.vue diff --git a/.env.production b/.env.production index 4ccd0e1a..7116fa28 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,7 @@ ENV = 'production' # 生产环境 # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http +# VUE_APP_BASE_API = 'https://xx.tuoz.net' VUE_APP_BASE_API = 'https://xx.tuoz.net' # 如果接口是 http 形式, wss 需要改为 ws VUE_APP_WS_API = 'wss://xx.tuoz.net' diff --git a/package.json b/package.json index 4af80405..e8165514 100644 --- a/package.json +++ b/package.json @@ -1,115 +1,117 @@ -{ - "name": "eladmin-web", - "version": "2.6.0", - "description": "拓众后台文件管理", - "author": "Zheng Jie", - "license": "Apache-2.0", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src", - "test:unit": "jest --clearCache && vue-cli-service test:unit", - "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", - "new": "plop" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "repository": { - "type": "git", - "url": "https://github.com/elunez/eladmin-web.git" - }, - "bugs": { - "url": "https://github.com/elunez/eladmin/issues" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.18.1", - "clipboard": "2.0.4", - "codemirror": "^5.49.2", - "connect": "3.6.6", - "echarts": "^4.2.1", - "echarts-gl": "^1.1.1", - "echarts-wordcloud": "^1.1.3", - "element-ui": "^2.13.2", - "file-saver": "1.3.8", - "fuse.js": "3.4.4", - "js-beautify": "^1.10.2", - "js-cookie": "2.2.0", - "jsencrypt": "^3.0.0-rc.1", - "jszip": "3.1.5", - "mavon-editor": "^2.9.0", - "normalize.css": "7.0.0", - "nprogress": "0.2.0", - "path-to-regexp": "2.4.0", - "qs": "^6.9.1", - "screenfull": "4.2.0", - "sortablejs": "1.8.4", - "vue": "2.6.10", - "vue-clipboard2": "^0.3.3", - "vue-count-to": "1.0.13", - "vue-cropper": "0.4.9", - "vue-echarts": "^5.0.0-beta.0", - "vue-highlightjs": "^1.3.3", - "vue-image-crop-upload": "^2.5.0", - "vue-router": "3.0.2", - "vue-splitpane": "1.0.4", - "vuedraggable": "2.20.0", - "vuex": "3.1.0", - "wangeditor": "^3.1.1", - "xlsx": "^0.14.1" - }, - "devDependencies": { - "@babel/core": "7.0.0", - "@babel/parser": "^7.7.4", - "@babel/register": "7.0.0", - "@vue/cli-plugin-babel": "3.5.3", - "@vue/cli-plugin-eslint": "^3.9.1", - "@vue/cli-plugin-unit-jest": "3.5.3", - "@vue/cli-service": "3.5.3", - "@vue/test-utils": "1.0.0-beta.29", - "autoprefixer": "^9.5.1", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "23.6.0", - "babel-plugin-dynamic-import-node": "2.3.0", - "babel-plugin-transform-remove-console": "^6.9.4", - "chalk": "2.4.2", - "chokidar": "2.1.5", - "connect": "3.6.6", - "eslint": "5.15.3", - "eslint-plugin-vue": "5.2.2", - "html-webpack-plugin": "3.2.0", - "http-proxy-middleware": "^0.19.1", - "husky": "1.3.1", - "lint-staged": "8.1.5", - "plop": "2.3.0", - "runjs": "^4.3.2", - "sass": "^1.26.10", - "sass-loader": "^7.1.0", - "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "0.7.2", - "serve-static": "^1.13.2", - "svg-sprite-loader": "4.1.3", - "svgo": "1.2.0", - "vue-template-compiler": "2.6.10" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +{ + "name": "eladmin-web", + "version": "2.6.0", + "description": "拓众后台文件管理", + "author": "Zheng Jie", + "license": "Apache-2.0", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", + "new": "plop" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "repository": { + "type": "git", + "url": "https://github.com/elunez/eladmin-web.git" + }, + "bugs": { + "url": "https://github.com/elunez/eladmin/issues" + }, + "dependencies": { + "@riophae/vue-treeselect": "0.4.0", + "axios": "0.18.1", + "clipboard": "2.0.4", + "codemirror": "^5.49.2", + "connect": "3.6.6", + "dayjs": "^1.11.10", + "echarts": "^4.2.1", + "echarts-gl": "^1.1.1", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.13.2", + "file-saver": "1.3.8", + "fuse.js": "3.4.4", + "js-beautify": "^1.10.2", + "js-cookie": "2.2.0", + "jsencrypt": "^3.0.0-rc.1", + "jszip": "3.1.5", + "mavon-editor": "^2.9.0", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "qs": "^6.9.1", + "screenfull": "4.2.0", + "sortablejs": "1.8.4", + "vue": "2.6.10", + "vue-clipboard2": "^0.3.3", + "vue-count-to": "1.0.13", + "vue-cropper": "0.4.9", + "vue-echarts": "^5.0.0-beta.0", + "vue-highlightjs": "^1.3.3", + "vue-image-crop-upload": "^2.5.0", + "vue-router": "3.0.2", + "vue-splitpane": "1.0.4", + "vuedraggable": "2.20.0", + "vuex": "3.1.0", + "wangeditor": "^3.1.1", + "xlsx": "^0.14.1" + }, + "devDependencies": { + "@babel/core": "7.0.0", + "@babel/parser": "^7.7.4", + "@babel/register": "7.0.0", + "@vue/cli-plugin-babel": "3.5.3", + "@vue/cli-plugin-eslint": "^3.9.1", + "@vue/cli-plugin-unit-jest": "3.5.3", + "@vue/cli-service": "3.5.3", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "^9.5.1", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "23.6.0", + "babel-plugin-dynamic-import-node": "2.3.0", + "babel-plugin-transform-remove-console": "^6.9.4", + "chalk": "2.4.2", + "chokidar": "2.1.5", + "connect": "3.6.6", + "core-js": "^3.34.0", + "eslint": "5.15.3", + "eslint-plugin-vue": "5.2.2", + "html-webpack-plugin": "3.2.0", + "http-proxy-middleware": "^0.19.1", + "husky": "1.3.1", + "lint-staged": "8.1.5", + "plop": "2.3.0", + "runjs": "^4.3.2", + "sass": "^1.26.10", + "sass-loader": "^7.1.0", + "script-ext-html-webpack-plugin": "2.1.3", + "script-loader": "0.7.2", + "serve-static": "^1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.0", + "vue-template-compiler": "2.6.10" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] +} diff --git a/src/api/index.js b/src/api/index.js index f05fa772..c74ed3cc 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -59,4 +59,36 @@ export function delRecord(data) { data }) } - +export function uploadActivityFiles(data) { + return request({ + url: '/api/uploadCallFile/upload/files', + method: 'post', + data + }) +} +// 活动任务导出 +export function uploadCallFileExport(params) { + return request({ + url: '/api/uploadCallFile/export', + method: 'get', + params, + responseType: 'blob' + }) +} +// 活动任务-折线图 +export function queryActivityLine(data) { + return request({ + url: '/api/uploadCallFile/query/number', + method: 'post', + data + }) +} +// 活动导出-折现 +export function uploadCallFileDownload(data) { + return request({ + url: '/api/uploadCallFile/query/download', + method: 'post', + data, + responseType: 'blob' + }) +} diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 7dad8819..37b0c0ac 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -194,6 +194,9 @@ aside { .ml-5 { margin-left: 5px; } +.mt-5 { + margin-bottom: 5px; +} .mt-10 { margin-bottom: 10px; } diff --git a/src/components/Echarts/LineChart.vue b/src/components/Echarts/LineChart.vue new file mode 100644 index 00000000..7f8f4dbb --- /dev/null +++ b/src/components/Echarts/LineChart.vue @@ -0,0 +1,104 @@ + + + diff --git a/src/views/DMPTesting/index.vue b/src/views/DMPTesting/index.vue index 2f75e5c7..096b4712 100644 --- a/src/views/DMPTesting/index.vue +++ b/src/views/DMPTesting/index.vue @@ -218,16 +218,15 @@ style="width: 160px" class="filter-item" /> - + - - + { const seriesArr = [] diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue deleted file mode 100644 index d91599f4..00000000 --- a/src/views/nested/menu1/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue deleted file mode 100644 index 532aa0f3..00000000 --- a/src/views/nested/menu1/menu1-1/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue deleted file mode 100644 index 59efea34..00000000 --- a/src/views/nested/menu1/menu1-2/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue deleted file mode 100644 index 3a6624f1..00000000 --- a/src/views/nested/menu2/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/streamingDetection/detectionTask.vue b/src/views/streamingDetection/detectionTask.vue new file mode 100644 index 00000000..949913ce --- /dev/null +++ b/src/views/streamingDetection/detectionTask.vue @@ -0,0 +1,282 @@ + + + + + + diff --git a/src/views/streamingDetection/effectStatistics.vue b/src/views/streamingDetection/effectStatistics.vue new file mode 100644 index 00000000..27a59ba2 --- /dev/null +++ b/src/views/streamingDetection/effectStatistics.vue @@ -0,0 +1,215 @@ + + + + + +