diff --git a/src/api/marketing-algorithm.js b/src/api/marketing-algorithm.js index 46ad37c..c74fd0d 100644 --- a/src/api/marketing-algorithm.js +++ b/src/api/marketing-algorithm.js @@ -2,24 +2,32 @@ * @Author: qinzhenpen qzp1807@126.com * @Date: 2024-08-16 10:14:59 * @LastEditors: qinzhenpen qzp1807@126.com - * @LastEditTime: 2024-08-16 15:37:34 + * @LastEditTime: 2024-08-16 16:38:09 * @FilePath: \vue3\src\api\marketing-algorithm.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import request from '@/utils/request' +import request from "@/utils/request"; // 选择指标分析数据展示 export function getMarketingAlgorithm(data) { return request({ - url: '/api/model/viewAnalyzeData', - method: 'POST', - data - }) + url: "/api/model/viewAnalyzeData", + method: "POST", + data, + }); } // 查看指标 export function getMarketingAlgorithmList(params) { return request({ - url: '/api/model/viewMetrics', - method: 'POST', - params - }) -} \ No newline at end of file + url: "/api/model/viewMetrics", + method: "POST", + params, + }); +} +// 描述性统计数据预处理 +export function getMarketingAlgorithmPreprocessing(data) { + return request({ + url: "/api/model/descriptiveStatistics", + method: "POST", + data, + }); +} diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 331e95f..4b65962 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -134,6 +134,10 @@ aside { .pagination-container { margin-top: 30px; + background-color: transparent !important; + .el-pagination__total,.el-pagination__goto,.el-pagination__classifier{ + color: #ffffff !important; + } } .text-center { @@ -183,7 +187,8 @@ aside { margin-bottom: 10px; } } -.app-container{ + +.app-container { margin: 10px; box-shadow: 0px 0px 13px 0px #0452C6; border-radius: 10px; @@ -192,18 +197,22 @@ aside { .dialog-footer { text-align: center; + .el-button:nth-child(1) { background: url("../../assets/images/szjj/提交任务.png") no-repeat; background-size: 100% 100%; } + .el-button:nth-child(2) { background: url("../../assets/images/szjj/重新开始.png") no-repeat; background-size: 100% 100%; } + .el-button--large.is-round { padding: 12px 20px 12px 40px !important; } - .el-button{ + + .el-button { width: 136px; height: 40px; padding: 12px 20px 12px 40px !important; @@ -212,6 +221,7 @@ aside { color: #ffffff; } } + .app-container2 { position: relative; padding: 20px; diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index a7d3ec9..929f414 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -119,7 +119,7 @@ } .pagination-container .el-pagination { - right: 0; + // right: 0; position: absolute; } diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index f00bdc0..af31f52 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -5,8 +5,7 @@ transition: margin-left .28s; margin-left: $base-sidebar-width; position: relative; - background: url("@/assets/images/背景.png") no-repeat; - background-size: 100% 100%; + } .sidebarHide { diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index ab5490c..af1d101 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,9 +1,17 @@ + - diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 4b0abaa..3eae115 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,3 +1,11 @@ +