diff --git a/.env.development b/.env.development index 96d9000..40a8245 100644 --- a/.env.development +++ b/.env.development @@ -5,4 +5,4 @@ VITE_APP_TITLE = 数字营销实训系统 VITE_APP_ENV = 'development' # 若依管理系统/开发环境 -VITE_APP_BASE_API = 'http://118.31.7.2:9868' +VITE_APP_BASE_API = 'http://120.79.54.255:9868' diff --git a/.env.production b/.env.production index 82264a3..0df42a0 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,11 @@ +### + # @Author: qinzhenpen qzp1807@126.com + # @Date: 2024-08-27 10:39:50 + # @LastEditors: qinzhenpen qzp1807@126.com + # @LastEditTime: 2024-08-28 17:15:51 + # @FilePath: \digital-marketing\.env.production + # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE +### # 页面标题 VITE_APP_TITLE = 数字营销实训系统 @@ -5,7 +13,7 @@ VITE_APP_TITLE = 数字营销实训系统 VITE_APP_ENV = 'production' # 若依管理系统/生产环境 -VITE_APP_BASE_API = 'http://118.31.7.2:9868' +VITE_APP_BASE_API = 'http://120.79.54.255:9868' # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/dist.tar b/dist.tar index 5a8ddfe..8c4a69a 100644 Binary files a/dist.tar and b/dist.tar differ diff --git a/src/App.vue b/src/App.vue index 9532929..6d99f4f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,3 +1,11 @@ + @@ -5,11 +13,16 @@ + \ No newline at end of file diff --git a/src/components/video/index.vue b/src/components/video/index.vue index 9e54013..7d08364 100644 --- a/src/components/video/index.vue +++ b/src/components/video/index.vue @@ -1,7 +1,16 @@ + @@ -11,11 +20,11 @@ import useAlgorithmStore from "@/store/modules/algorithm.js"; const algorithmStore = useAlgorithmStore(); import { VideoPlayer } from "@videojs-player/vue"; import "video.js/dist/video-js.css"; -import { onMounted } from "vue"; +import { nextTick, onMounted } from "vue"; const router = useRouter(); const player = shallowRef(); const videlinfo = ref({}); -const videoSrc = ref("https://szjj.sztzjy.com:99/uploadFile/2024/2/26/3ef371decafa4bcc84c181dea4a0797f.mp4"); +const videoSrc = ref(""); const playerOptions = ref({ playbackRates: [0.7, 1.0, 1.5, 2.0], sources: [ @@ -24,7 +33,7 @@ const playerOptions = ref({ src: videoSrc.value, }, ], - height: 600, + height: 750, autoplay: "any", muted: true, loop: false, @@ -51,8 +60,12 @@ const handleEvent = (log) => { // console.log("Basic player event", log); }; onMounted(() => { - videlinfo.value = cache.session.getJSON("video_history") - videlinfo.value.resourcesName = videlinfo.value.resourcesName.replace(/.mp4/g, "") + videlinfo.value = cache.session.getJSON("video_history"); + videlinfo.value.resourcesName = videlinfo.value.resourcesName.replace(/.mp4/g, ""); + videoSrc.value = `http://120.79.54.255:8042/file${videlinfo.value.resourcesUrl}`; + nextTick(() => { + playerOptions.value.sources[0].src = videoSrc.value; + }); }); \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 3944e74..081ef49 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,4 +1,3 @@ - import axios from "axios"; import { ElNotification, ElMessageBox, ElMessage, ElLoading } from "element-plus"; import { getToken } from "@/utils/auth"; @@ -17,7 +16,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8"; const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 // baseURL: import.meta.env.VITE_APP_BASE_API, - baseURL: "http://118.31.7.2:9868/", + baseURL: "http://120.79.54.255:9868/", // baseURL:'http://192.168.2.14:9868/', // 超时 timeout: 100000, @@ -46,6 +45,10 @@ service.interceptors.request.use( time: new Date().getTime(), }; const sessionObj = cache.session.getJSON("sessionObj"); + if (sessionObj === undefined || sessionObj === null || sessionObj === "") { + cache.session.setJSON("sessionObj", requestObj); + } else { + } } return config; }, diff --git a/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue b/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue index 4b1c2a7..589a1cf 100644 --- a/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue +++ b/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue @@ -128,7 +128,7 @@ const sendText = async () => { const messageId = Date.now(); const newMessage = reactive({ id: messageId, type: "ai-main", displayContent: "" }); messages.push(newMessage); - const resp = await fetch("http://118.31.7.2:9868/api/bigModule/createArticleByAi", { + const resp = await fetch("http://120.79.54.255:9868/api/bigModule/createArticleByAi", { method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue b/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue index ea94d4a..0d6e62e 100644 --- a/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue +++ b/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue @@ -213,7 +213,7 @@ const downloadArticle=()=>{ return proxy.$modal.msgWarning("请先完成上一步") } answerRecord.value=2 - window.open(`http://118.31.7.2:9868/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`) + window.open(`http://120.79.54.255:9868/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`) } // 识别文字 diff --git a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue index f097e52..d425309 100644 --- a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue +++ b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue @@ -2,7 +2,7 @@
任务描述 -

使用“购物车数据”，对所购商品进行购物篮分析（关联规则挖掘），其中min_support = 0.4， +

使用“购物车数据”，对所购商品进行购物篮分析（关联规则挖掘），其中min_support = 0.4， min_confidence = 0.5，最后将运行结果提交实训任务。

diff --git a/src/views/digitalMarketingAlgorithms/components/bigData.vue b/src/views/digitalMarketingAlgorithms/components/bigData.vue index a478ed3..526137d 100644 --- a/src/views/digitalMarketingAlgorithms/components/bigData.vue +++ b/src/views/digitalMarketingAlgorithms/components/bigData.vue @@ -27,14 +27,16 @@
- - - - - - + + + + + + + +
@@ -46,14 +48,16 @@ import useUserStore from "@/store/modules/user"; import useAlgorithmStore from "@/store/modules/algorithm.js"; const { proxy } = getCurrentInstance(); import { getUserInfo } from "@/utils/auth"; +import { warn } from "vue"; const userInfo = JSON.parse(getUserInfo()); const loading = ref(false); const fileData = ref(null); +const scrollbarHeight = ref(0); const algorithmStore = useAlgorithmStore(); // 数据表query const n_dataTableQuery = ref({ index: 1, - size: 7, + size: 15, tableName: "", userId: userInfo.userId, }); @@ -62,42 +66,19 @@ const nzIndex = ref(0); const nzData = ref([]); const zjIndex = ref(-1); const zjData = ref([]); -const tableLabel = ref([ - { prop: "id", label: "ID" }, - { prop: "age", label: "年龄" }, - { prop: "annualIncome", label: "年收入" }, - { prop: "spendingScore", label: "消费水平" }, -]); -const tableLabel3 = ref([ - { prop: "id", label: "ID" }, - { prop: "content", label: "评论内容" }, - { prop: "creationTime", label: "评论时间" }, - { prop: "nickName", label: "昵称" }, - { prop: "referenceName", label: "评论对象" }, - { prop: "contentType", label: "评论类型" }, -]); -const tableLabel4 = ref([ - { prop: "id", label: "ID" }, - { prop: "salesVolume", label: "销售量" }, - { prop: "salesForehead", label: "销售额" }, -]); -const tableLabel5 = ref([ - { prop: "id", label: "ID" }, - { prop: "consumerGoods", label: "消费商品" }, -]); - +const tableLabel = ref([]); const tableLabel2 = ref([]); const arrhander = ref([]); const arrhanderkey = ref([]); -const arrMap = { - 客户细分数据表: tableLabel.value, - 销售预测数据表: tableLabel4.value, - 购物车数据表: tableLabel5.value, - 用户评论表: tableLabel3.value, -}; +// const arrMap = { +// 客户细分数据表: tableLabel.value, +// 销售预测数据表: tableLabel4.value, +// 购物车数据表: tableLabel5.value, +// 用户评论表: tableLabel3.value, +// }; const goNZ = (index, item) => { nzIndex.value = index; - tableLabel.value = arrMap[item]; + // tableLabel.value = arrMap[item]; n_dataTableQuery.value.tableName = item; delete n_dataTableQuery.value.selfTableName; getSurface(); @@ -125,6 +106,7 @@ const getSurface = () => { portraitModel .getUserTableData(n_dataTableQuery.value) .then((res) => { + tableLabel.value = Object.keys(res?.data?.list[0]); tableData.value = res?.data?.list; datatotal.value = res?.data?.total; tableLabel2.value = []; @@ -137,7 +119,7 @@ const getSurface = () => { label: item, }); }); - tableLabel.value = tableLabel2.value; + tableLabel.value = arrhanderkey.value; } setTimeout(() => { loading.value = false; @@ -172,6 +154,7 @@ const importData = (e) => { const selectZJ = (item) => { portraitModel.getUserTableInfo({ userId: userInfo.userId }).then((res) => { nzData.value = res.data.tableNames; + console.log(tableLabel.value, " tableLabel.value"); n_dataTableQuery.value.tableName = nzData.value[0]; getSurface(); algorithmStore.userDataLabel = [...res?.data.tableNames, ...res.data.selfBuiltTable].filter((item) => item !== "用户评论表"); @@ -191,13 +174,12 @@ onMounted(() => { diff --git a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue index 9d9e0cc..dfa7fc4 100644 --- a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue +++ b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue @@ -2,7 +2,7 @@
任务描述 -

使用“客户细分数据”，对客户进行聚类分析，并提交实训任务。

+

使用“客户细分数据”，对客户进行聚类分析，并提交实训任务。

diff --git a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue index 1f25f10..bc52255 100644 --- a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue +++ b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue @@ -2,7 +2,7 @@
任务描述 -

使用“销售预测数据”，建立回归模型，并预测销量是84610下的销售额，最后提交实训任务。

+

使用“销售预测数据”，建立回归模型，并预测销量是84610下的销售额，最后提交实训任务。

diff --git a/src/views/learningCenter/Achievement.vue b/src/views/learningCenter/Achievement.vue index b67a6f4..9fd74e6 100644 --- a/src/views/learningCenter/Achievement.vue +++ b/src/views/learningCenter/Achievement.vue @@ -476,7 +476,7 @@ const uploadReport = async (id) => { if (!id) { return; } - window.open(`http://118.31.7.2:9868/api/stu/concept/block/download?TOKEN=${"Bearer " + getToken()}&id=${id}`); + window.open(`http://120.79.54.255:9868/api/stu/concept/block/download?TOKEN=${"Bearer " + getToken()}&id=${id}`); // window.open(`http://202.97.179.126:8800/api/stu/concept/block/download?reportName=${tableData2.value[0].reportName}&TOKEN= ${'Bearer '+getToken()}&module=${data2.module}&userId=${data.userId}`) // window.open(`http://202.199.90.115:8800/api/stu/concept/block/download?reportName=${tableData2.value[0].reportName}&TOKEN= ${'Bearer '+getToken()}&module=${data2.module}&userId=${data.userId}`) }; diff --git a/src/views/learningCenter/learningResources.vue b/src/views/learningCenter/learningResources.vue index dc9ae2f..9970e33 100644 --- a/src/views/learningCenter/learningResources.vue +++ b/src/views/learningCenter/learningResources.vue @@ -3,15 +3,15 @@
- +
- + {{ i.resourcesName }}
- +
@@ -51,8 +51,10 @@ onMounted(() => { }); const showResource = async (i) => { - window.open("/video", "_blank"); - cache.session.set('video_history',JSON.stringify(i)) + await cache.session.set("video_history", JSON.stringify(i)); + setTimeout(() => { + window.open("/video", "_blank"); + }, 300); // 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/login.vue b/src/views/login.vue index 4ce1649..00e3cd5 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,5 +1,5 @@