diff --git a/package.json b/package.json index d9e12de..997be84 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,13 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@antv/g2": "^5.2.3", + "echarts-stat": "^1.2.0", "@element-plus/icons-vue": "2.0.10", "@vueup/vue-quill": "1.1.0", "@vueuse/core": "9.5.0", "axios": "0.27.2", "echarts": "5.4.0", - "echarts-stat": "^1.2.0", "element-plus": "2.2.27", "file-saver": "2.0.5", "fuse.js": "6.6.2", diff --git a/src/api/marketing-algorithm.js b/src/api/marketing-algorithm.js index c74fd0d..b49b8c4 100644 --- a/src/api/marketing-algorithm.js +++ b/src/api/marketing-algorithm.js @@ -2,7 +2,7 @@ * @Author: qinzhenpen qzp1807@126.com * @Date: 2024-08-16 10:14:59 * @LastEditors: qinzhenpen qzp1807@126.com - * @LastEditTime: 2024-08-16 16:38:09 + * @LastEditTime: 2024-08-17 16:57:01 * @FilePath: \vue3\src\api\marketing-algorithm.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -31,3 +31,27 @@ export function getMarketingAlgorithmPreprocessing(data) { data, }); } +// 自建表导入 +export function getMarketingAlgorithmImport(data) { + return request({ + url: "/api/userprofile/uploadExcel", + method: "POST", + data, + }); +} +// 查询自建表 +export function getMarketingAlgorithmTable(params) { + return request({ + url: "/api/userprofile/selfExcelBaseInfo", + method: "GET", + params, + }); +} +// 算法知识导入 +export function getMarketingAlgorithmKnowledgeImport(data) { + return request({ + url: "/api/model/batchImport", + method: "POST", + data, + }); +} \ No newline at end of file diff --git a/src/assets/images/10027.png b/src/assets/images/10027.png new file mode 100644 index 0000000..ce1edcf Binary files /dev/null and b/src/assets/images/10027.png differ diff --git a/src/assets/images/f1001.png b/src/assets/images/f1001.png new file mode 100644 index 0000000..ff958ed Binary files /dev/null and b/src/assets/images/f1001.png differ diff --git a/src/assets/images/f10010.png b/src/assets/images/f10010.png new file mode 100644 index 0000000..f9ab768 Binary files /dev/null and b/src/assets/images/f10010.png differ diff --git a/src/assets/images/f10011.png b/src/assets/images/f10011.png new file mode 100644 index 0000000..0af66d5 Binary files /dev/null and b/src/assets/images/f10011.png differ diff --git a/src/assets/images/f10012.png b/src/assets/images/f10012.png new file mode 100644 index 0000000..7263d1c Binary files /dev/null and b/src/assets/images/f10012.png differ diff --git a/src/assets/images/f10013.png b/src/assets/images/f10013.png new file mode 100644 index 0000000..95abd97 Binary files /dev/null and b/src/assets/images/f10013.png differ diff --git a/src/assets/images/f10014.png b/src/assets/images/f10014.png new file mode 100644 index 0000000..8f6b0ee Binary files /dev/null and b/src/assets/images/f10014.png differ diff --git a/src/assets/images/f10015.png b/src/assets/images/f10015.png new file mode 100644 index 0000000..b506478 Binary files /dev/null and b/src/assets/images/f10015.png differ diff --git a/src/assets/images/f10016.png b/src/assets/images/f10016.png new file mode 100644 index 0000000..ec834ec Binary files /dev/null and b/src/assets/images/f10016.png differ diff --git a/src/assets/images/f10017.png b/src/assets/images/f10017.png new file mode 100644 index 0000000..cec4425 Binary files /dev/null and b/src/assets/images/f10017.png differ diff --git a/src/assets/images/f10018.png b/src/assets/images/f10018.png new file mode 100644 index 0000000..657de40 Binary files /dev/null and b/src/assets/images/f10018.png differ diff --git a/src/assets/images/f10019.png b/src/assets/images/f10019.png new file mode 100644 index 0000000..19a8e4b Binary files /dev/null and b/src/assets/images/f10019.png differ diff --git a/src/assets/images/f1002.png b/src/assets/images/f1002.png new file mode 100644 index 0000000..d6cd99a Binary files /dev/null and b/src/assets/images/f1002.png differ diff --git a/src/assets/images/f10020.png b/src/assets/images/f10020.png new file mode 100644 index 0000000..7b6053e Binary files /dev/null and b/src/assets/images/f10020.png differ diff --git a/src/assets/images/f10021.png b/src/assets/images/f10021.png new file mode 100644 index 0000000..7561efb Binary files /dev/null and b/src/assets/images/f10021.png differ diff --git a/src/assets/images/f10022.png b/src/assets/images/f10022.png new file mode 100644 index 0000000..7c35b99 Binary files /dev/null and b/src/assets/images/f10022.png differ diff --git a/src/assets/images/f10023.png b/src/assets/images/f10023.png new file mode 100644 index 0000000..f3ce3db Binary files /dev/null and b/src/assets/images/f10023.png differ diff --git a/src/assets/images/f10024.png b/src/assets/images/f10024.png new file mode 100644 index 0000000..e42fcc9 Binary files /dev/null and b/src/assets/images/f10024.png differ diff --git a/src/assets/images/f10025.png b/src/assets/images/f10025.png new file mode 100644 index 0000000..c56a2d3 Binary files /dev/null and b/src/assets/images/f10025.png differ diff --git a/src/assets/images/f10026.png b/src/assets/images/f10026.png new file mode 100644 index 0000000..5981b0a Binary files /dev/null and b/src/assets/images/f10026.png differ diff --git a/src/assets/images/f1003.png b/src/assets/images/f1003.png new file mode 100644 index 0000000..d6cd99a Binary files /dev/null and b/src/assets/images/f1003.png differ diff --git a/src/assets/images/f1005.png b/src/assets/images/f1005.png new file mode 100644 index 0000000..b7dabc8 Binary files /dev/null and b/src/assets/images/f1005.png differ diff --git a/src/assets/images/f2001.png b/src/assets/images/f2001.png new file mode 100644 index 0000000..529e968 Binary files /dev/null and b/src/assets/images/f2001.png differ diff --git a/src/assets/images/f2002.png b/src/assets/images/f2002.png new file mode 100644 index 0000000..0670aed Binary files /dev/null and b/src/assets/images/f2002.png differ diff --git a/src/assets/images/f2004.png b/src/assets/images/f2004.png new file mode 100644 index 0000000..f86f867 Binary files /dev/null and b/src/assets/images/f2004.png differ diff --git a/src/assets/images/taskImport.png b/src/assets/images/taskImport.png new file mode 100644 index 0000000..96f14f5 Binary files /dev/null and b/src/assets/images/taskImport.png differ diff --git a/src/assets/images/弹框@2x.png b/src/assets/images/弹框@2x.png new file mode 100644 index 0000000..102f6a6 Binary files /dev/null and b/src/assets/images/弹框@2x.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 19ef89e..ccbed3f 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -227,4 +227,33 @@ aside { background: #FFFFFF; box-shadow: 0px 0px 13px 0px #D6E0FE; border-radius: 10px; +} +.dialogClass{ + background:url('@/assets/images/弹框.png') !important; + background-size: 100% 100% !important; + .el-dialog__header{ + padding: 5px 0px; + margin-right: 5px !important; + .gbImg{ + cursor: pointer; + width: 51px; + height: 31px; + background-size: 100% 100%; + } + } + .xtImg{ + margin-left: 18px; + width: 530px; +} +} +.my-header { +display: flex; +flex-direction: row; +justify-content: space-between; +gap: 16px; +text-align: center; +span{ + color: #FFFFFF; + padding: 38px 20px 0; +} } \ No newline at end of file diff --git a/src/layout/index.vue b/src/layout/index.vue index c544910..0a87795 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,28 +1,14 @@ @@ -135,6 +206,44 @@ onMounted(() => { color: #ffffff; } } + .metrics { + padding: 0px 7px !important; + :deep(.el-input) { + .el-input__wrapper { + background-color: #ffffff00; + background-image: url("../../../assets/images/下拉框.png"); + background-size: 100% 100%; + } + --el-input-text-color: #ffffff; + --el-input-border-color: #ffffff00; + --el-input-hover-border-color: #ffffff00; + --el-input-hover-border: #ffffff00; + --el-select-border-color-hover: #ffffff00; + --el-select-input-focus-border-color: #ffffff00; + --el-input-placeholder-color: #ffffff; + .el-input__inner { + color: #ffffff; + } + } + } + } + .left-button { + width: 195px; + height: 31px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + margin-top: 20px !important; + :deep(.el-button) { + width: 149px; + height: 48px; + background: url("../../../assets/images/确定.png"); + color: #ffffff; + border-color: #ffffff00; + background-size: 100% 100%; + margin: 15px; + } } } .main-right { diff --git a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue index 9b72343..684aa9a 100644 --- a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue +++ b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue @@ -5,7 +5,7 @@

(给出任务清单参考,做哪些数据的统计分析)Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.

- 算法知识导入 + 算法知识导入 实训任务提交
@@ -100,15 +100,15 @@ - +
分析结果: - 下载 + 下载 - +
@@ -176,23 +176,24 @@ - + \ No newline at end of file diff --git a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue index 533fec0..afd27ed 100644 --- a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue +++ b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue @@ -644,35 +644,4 @@ font-size: 16px; } } - - \ No newline at end of file diff --git a/src/views/digitalMarketingAlgorithms/index.vue b/src/views/digitalMarketingAlgorithms/index.vue index 5b67fd9..5878091 100644 --- a/src/views/digitalMarketingAlgorithms/index.vue +++ b/src/views/digitalMarketingAlgorithms/index.vue @@ -40,6 +40,9 @@ .top_item{ img{ margin-right: 5px; + } + .el-button{ + padding-left: 49px !important; } .el-button:nth-child(1) { width: 170px; @@ -87,7 +90,7 @@ background: url('../../assets/images/66.png'); color:#FFFFFF; border-color:#FFFFFF00; - padding:8px 5px 8px 30px; + padding:8px 21px 8px 25px; background-size: 100% 100%; } .el-button:nth-child(7) { @@ -98,9 +101,9 @@ border-color:#FFFFFF00; padding:8px 5px 8px 20px; } - // .active{ - // background: url('../../assets/images/亮(钮).png'); - // } + .active{ + background: url('../../assets/images/亮(钮).png'); + } } } diff --git a/src/views/learningCenter/learningResources.vue b/src/views/learningCenter/learningResources.vue index 0e138e4..ddfbac4 100644 --- a/src/views/learningCenter/learningResources.vue +++ b/src/views/learningCenter/learningResources.vue @@ -55,7 +55,6 @@ }) const showResource=async(i)=>{ - console.log(i); // const newWindow=window.open(`http://192.168.2.4:8800/api/stu/concept/block/getResource?`+`module=${data2.module}`+`&name=${i}`) // window.open(`http://qkljr.sztzjy.com:90/api/stu/concept/block/getResource?`+`module=${data2.module}`+`&name=${i}`) if(i.includes('mp4')){ diff --git a/src/views/portraitModel/components/AARRRAnalysis.vue b/src/views/portraitModel/components/AARRRAnalysis.vue index 279eea1..83d39af 100644 --- a/src/views/portraitModel/components/AARRRAnalysis.vue +++ b/src/views/portraitModel/components/AARRRAnalysis.vue @@ -1,10 +1,10 @@ diff --git a/src/views/portraitModel/components/viscosityAnalysis.vue b/src/views/portraitModel/components/viscosityAnalysis.vue index 6d0163a..0e411fa 100644 --- a/src/views/portraitModel/components/viscosityAnalysis.vue +++ b/src/views/portraitModel/components/viscosityAnalysis.vue @@ -1,10 +1,10 @@