提交最新代码

dev-QQq
qinzhenpen 2 years ago
parent 031810c1d4
commit e643847b11

@ -1,3 +1,11 @@
###
# @Author: qinzhenpen qzp1807@126.com
# @Date: 2024-08-28 17:21:18
# @LastEditors: qinzhenpen qzp1807@126.com
# @LastEditTime: 2024-08-30 17:10:29
# @FilePath: \digital-marketing\.env.development
# @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
###
# 页面标题
VITE_APP_TITLE = 数字营销实训系统
@ -5,4 +13,4 @@ VITE_APP_TITLE = 数字营销实训系统
VITE_APP_ENV = 'development'
# 若依管理系统/开发环境
VITE_APP_BASE_API = 'http://120.79.54.255:9868'
VITE_APP_BASE_API = 'https://szyx.sztzjy.com:9868'

@ -13,7 +13,7 @@ VITE_APP_TITLE = 数字营销实训系统
VITE_APP_ENV = 'production'
# 若依管理系统/生产环境
VITE_APP_BASE_API = 'http://120.79.54.255:9868'
VITE_APP_BASE_API = 'https://szyx.sztzjy.com:9868'
# 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip

Binary file not shown.

@ -75,10 +75,11 @@
padding: 25px 18px;
.el-sub-menu {
margin-bottom: 20px;
margin-bottom: 0px !important;
.el-sub-menu__title {
height: 37px;
line-height: 37px;
background: url('../images/sidebar-normal.png') no-repeat;
background-size: 100% 100% !important;
}
@ -88,7 +89,7 @@
.el-menu-item {
min-width: 100% !important;
height: 37px;
height: 30px;
color: #fff;
padding-left: 4px;
background: transparent !important;
@ -106,6 +107,7 @@
align-items: center;
margin-bottom: 20px;
height: 37px;
line-height: 37px;
color: #fff;
background: url('../images/sidebar-normal.png') no-repeat;
background-size: 100% 100% !important;

@ -2,7 +2,7 @@
* @Author: qinzhenpen qzp1807@126.com
* @Date: 2024-08-28 17:09:02
* @LastEditors: qinzhenpen qzp1807@126.com
* @LastEditTime: 2024-08-28 18:37:43
* @LastEditTime: 2024-08-30 17:09:21
* @FilePath: \digital-marketing\src\components\video\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@ -62,7 +62,7 @@ const handleEvent = (log) => {
onMounted(() => {
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}`;
videoSrc.value = `https://szyx.sztzjy.com:8042/file${videlinfo.value.resourcesUrl}`;
nextTick(() => {
playerOptions.value.sources[0].src = videoSrc.value;
});

@ -16,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://120.79.54.255:9868/",
baseURL: "https://szyx.sztzjy.com:9868/",
// baseURL:'http://192.168.2.14:9868/',
// 超时
timeout: 100000,

@ -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://120.79.54.255:9868/api/bigModule/createArticleByAi", {
const resp = await fetch("https://szyx.sztzjy.com:9868/api/bigModule/createArticleByAi", {
method: "POST",
headers: {
"Content-Type": "application/json",

@ -213,7 +213,7 @@ const downloadArticle=()=>{
return proxy.$modal.msgWarning("请先完成上一步")
}
answerRecord.value=2
window.open(`http://120.79.54.255:9868/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`)
window.open(`https://szyx.sztzjy.com:9868/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`)
}
//

@ -29,7 +29,7 @@
<img src="../../assets/icons/svg/sxbg.svg" />
<span style="color: #ffffff">实训报告</span>
</div>
<!-- action="http://qkljr.sztzjy.com:90/api/stu/concept/block/upload" -->
<!-- action="https://qkljr.sztzjy.com:90/api/stu/concept/block/upload" -->
<!-- <el-upload ref="uploadRef" class="upload-demo" :file-list="fileList" :auto-upload="false" :on-change="handleChange" :show-file-list="false" multiple="multiple">
<template #trigger>
@ -476,9 +476,7 @@ const uploadReport = async (id) => {
if (!id) {
return;
}
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}`)
window.open(`https://szyx.sztzjy.com:9868/api/stu/concept/block/download?TOKEN=${"Bearer " + getToken()}&id=${id}`);
};
const isUpdate = ref(false);
//

@ -55,39 +55,6 @@ const showResource = async (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")) {
// const newWindow = window.open("", "_blank");
// newWindow.document.write(`
// <html>
// <head>
// <title></title>
// <style>
// // body {
// // margin: 0;
// // display: flex;
// // justify-content: center;
// // align-items: center;
// // height: 100vh;
// // background-color: #333333;
// // }
// </style>
// </head>
// <body>
// // <video controls autoplay controlsList="nodownload">
// // <source src="http://118.31.7.2:8042/file/${i}" type="video/mp4">
// // </video>
// </body>
// </html>
// `);
// }
// if (i.includes("pdf")) {
// // window.open(`http://qkljr.sztzjy.com:90/api/stu/concept/block/getResource?`+`module=${data2.module}`+`&name=${i}#toolbar=0`)
// window.open(`http://118.31.7.2:8042/file/${i}#toolbar=0`);
// // window.open(`http://202.199.90.115:8800/api/stu/concept/block/getResource?`+`module=${data2.module}`+`&name=${i}`)
// }
};
const timer = ref(null);
let seconds = 0;

File diff suppressed because one or more lines are too long

@ -474,7 +474,6 @@ import { getUserInfo } from "@/utils/auth";
import * as portraitModel from "@/api/portraitModel";
import { downBlobFile } from "@/utils/index.js";
import { onBeforeUnmount, onMounted } from "vue";
// const baseURL = "http://192.168.2.16:9868/";
const baseUrl = import.meta.env.VITE_APP_BASE_API;
const dialogVisible = ref(false);
const { proxy } = getCurrentInstance();

@ -2,13 +2,13 @@
* @Author: qinzhenpen qzp1807@126.com
* @Date: 2024-08-16 09:16:26
* @LastEditors: qinzhenpen qzp1807@126.com
* @LastEditTime: 2024-08-28 17:51:46
* @LastEditTime: 2024-08-30 17:16:50
* @FilePath: \vue3\src\views\visual-analysis\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="el-Aitools">
<iframe id="iframe" src="http://118.31.7.2:96" width="100%" height="100%" frameborder="1"></iframe>
<iframe id="iframe" src="https://szyx.sztzjy.com:96" width="100%" height="100%" frameborder="1"></iframe>
</div>
</template>
<script setup></script>

Loading…
Cancel
Save