Compare commits

..

28 Commits

Author SHA1 Message Date
xu
e629d127ab SZX-1324视频播放卡顿。 2025-12-10 14:38:17 +08:00
xu
909a70643f SZX-1324视频播放卡顿。 2025-12-10 14:24:13 +08:00
xu
3c19a7550c SZX-1324视频播放卡顿。 2025-12-10 14:16:52 +08:00
joshen
738add6f18 Merge branch 'master' into ebiz-uat-2025-11-06 2025-12-04 19:30:29 +08:00
joshen
a7763057c4 Merge remote-tracking branch 'aliyun/20251203-fix-1320' 2025-12-04 17:18:25 +08:00
joshen
421e2b2c51 Merge remote-tracking branch 'aliyun/ebiz-uat-2025-11-06' into ebiz-uat-2025-11-06 2025-12-04 11:07:03 +08:00
bjzhoujian
4e1940b36f 设置ai弹窗滑动 2025-12-02 10:57:24 +08:00
joshen
3e344a8374 Merge branch 'master' into ebiz-uat-2025-11-06 2025-11-27 17:58:33 +08:00
joshen
82598dd5e0 Merge branch '20251124-fix-1302' 2025-11-27 17:10:43 +08:00
zxj
da72c156e9 fix:修复案例详情校验携带缓存 2025-11-27 12:19:47 +08:00
joshen
f731bb425f Merge branch '20251124-fix-1302' 2025-11-25 19:09:03 +08:00
zxj
8c2f128578 fix:回滚案例详情校验调整 2025-11-25 18:53:35 +08:00
joshen
f16c6eb157 Merge branch '20251124-fix-1302' 2025-11-25 17:44:58 +08:00
bjzhoujian
6016e00ae8 top设为0 2025-11-25 16:42:48 +08:00
bjzhoujian
7155976f31 样式修改 2025-11-25 16:05:02 +08:00
bjzhoujian
4ca01ba233 阻止冒泡 2025-11-25 15:07:09 +08:00
bjzhoujian
7368fa7a8c 调试回车导致弹窗闪动 2025-11-25 11:57:07 +08:00
joshen
d09cbfac5f Merge remote-tracking branch 'aliyun/ebiz-uat-2025-11-06' into ebiz-uat-2025-11-06 2025-11-25 11:03:24 +08:00
bjzhoujian
fd903d0974 调试回车导致弹窗闪动 2025-11-25 10:06:21 +08:00
dong.ai
42885e0d61 修改标题展示 2025-11-24 18:35:56 +08:00
zxj
0b3b9ad082 fix:请求uapi.boe.com.cn禁用缓存 2025-11-24 17:44:06 +08:00
zxj
38fe538e4e fix:案例详情校验禁用缓存 2025-11-24 16:30:47 +08:00
joshen
052ab0be6f Merge branch '20251121-fix-1298' 2025-11-22 17:51:01 +08:00
zxj
4c453e3974 fix:跳转登录判断是否被嵌入 2025-11-22 14:28:58 +08:00
zxj
47dde458de fix:修复被嵌页面token过期不一致问题 2025-11-21 10:33:35 +08:00
670788339
3701605f7a 标签-精品课程库 课程名称与标签间距调整 2025-11-19 17:59:40 +08:00
670788339
b021be2f6f Merge remote-tracking branch '104/master' into 104-master 2025-11-19 13:37:35 +08:00
670788339
11e34ca335 标签-课程库 课程名称与标签间距调整 2025-11-19 13:37:14 +08:00
17 changed files with 4172 additions and 3287 deletions

View File

@@ -87,4 +87,16 @@
border: 1px solid #e7e7e7 !important;
box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
}
#app {
pointer-events: none;
}
#app > *:not(.case-expert-dialog) {
pointer-events: auto;
}
.case-expert-dialog {
pointer-events: auto;
}
</style>

View File

@@ -52,7 +52,12 @@ const formRequest=axios.create({
if (code === 401) {
//Message({message: msg, type: 'error'});
store.dispatch('LogOut').then(() => {
location.href = this.webBaseUrl + ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';

View File

@@ -54,7 +54,12 @@ const formRequest=axios.create({
} else {
if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = this.webBaseUrl + ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';

View File

@@ -53,7 +53,12 @@ jsonRequest.interceptors.response.use(res => {
} else {
if (code == 6001) { //对方是字符串,所以这里不要使用三个等号
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
@@ -117,7 +122,12 @@ formRequest.interceptors.response.use(res => {
} else {
if (code == 6001) { //对方是字符串,所以这里不要使用三个等号
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';

View File

@@ -50,7 +50,12 @@ jsonRequest.interceptors.response.use(res => {
} else {
if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = this.webBaseUrl + ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
@@ -112,7 +117,12 @@ formRequest.interceptors.response.use(res => {
} else {
if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = this.webBaseUrl + ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';

View File

@@ -50,7 +50,12 @@ jsonRequest.interceptors.response.use(res => {
} else {
if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = this.webBaseUrl + ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
@@ -112,7 +117,12 @@ formRequest.interceptors.response.use(res => {
} else {
if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = this.webBaseUrl + ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';

View File

@@ -86,7 +86,12 @@ router.beforeEach((to, from, next) => {
//console.log(location.href,'location.href');
//let urlPre=window.location.protocol+'//'+window.location.host;
//let backUrl=location.href.substring(urlPre.length); encodeURIComponent()
location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
if (top !== window) { // 判断当前是否在iframe内
top.location.href = process.env.VUE_APP_LOGIN_URL + "?returnUrl=" + encodeURIComponent(location.href);
} else {
window.location.href = process.env.VUE_APP_LOGIN_URL + "?returnUrl=" + encodeURIComponent(location.href);
}
// location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
NProgress.done()
}

View File

@@ -53,15 +53,30 @@ jsonRequest.interceptors.response.use(res => {
} else {
if (code == 6001) { //针对于老系统的处理
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 402) {
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
@@ -69,7 +84,12 @@ jsonRequest.interceptors.response.use(res => {
return Promise.reject(new Error(msg))
//return res.data;
} else if (code === 302) {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
} else {
//Message({message: res.data.message, type: 'error'});
//console.log('err:' + res.data.error);
@@ -127,22 +147,42 @@ formRequest.interceptors.response.use(res => {
} else {
if (code == 6001) { //针对于老系统的处理,因为老系统是字符串,所以这里不使用三等于号
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 401) {
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 402) {
store.dispatch('LogOut').then(() => {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
return Promise.reject(new Error(msg))
} else if (code === 302) {
location.href = ReLoginUrl;
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
} else {
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);

View File

@@ -163,11 +163,12 @@
<!-- 精品课模块 -->
<div class="xcontent2-main">
<div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
<!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
<!-- <span class="jin-text">精品课</span> -->
<div class="jin-zhe"></div>
<span class="quyer-tag" style="margin-left: 0px;">
<!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
<img class="modules-text" style="height: 28px;" src="../assets/images/course/courseTitle.png" alt="">
</span>
<span class="more">
<router-link to="/qualityCourse">查看更多>></router-link>
</span>
@@ -2826,6 +2827,15 @@ export default {
display: flex;
.modules-title {
position: relative;
.jin-zhe{
width: 410px;
height: 30px;
background: #f7f7f9;
position: absolute;
left: 86px;
}
.modules-text {
height: 28px;
font-size: 20px;
@@ -3136,4 +3146,13 @@ export default {
border: 1px solid #d9edf7;
//overflow: hidden;
}
.jin-text{
font-family: "Source Han Sans CN", "SourceHanSansCN", sans-serif !important;
font-weight: bold;
font-size: 20px;
color: #3E87F5;
// line-height: 29px;/
text-align: justify;
font-style: normal;
}
</style>

View File

@@ -5,9 +5,9 @@
</template>
<script>
import Cookies from 'vue-cookies'
import apiLogin from '@/api/login.js'
import { getToken,setToken } from '@/utils/token'
import Cookies from "vue-cookies";
import apiLogin from "@/api/login.js";
import { getToken, setToken } from "@/utils/token";
export default {
mounted() {
this.toUrl = this.$route.query.returnUrl;
@@ -19,11 +19,16 @@
$this.curToken = getToken();
if (!$this.curToken) {
//console.log(token,'第二次未获取token');
location.href = process.env.VUE_APP_LOGIN_URL;
if (top !== window) {
// 判断当前是否在iframe内
top.location.href = process.env.VUE_APP_LOGIN_URL;
} else {
window.location.href = process.env.VUE_APP_LOGIN_URL;
}
// location.href = process.env.VUE_APP_LOGIN_URL;
} else {
$this.boeLogin();
}
}, 500);
} else {
this.curToken = token;
@@ -32,29 +37,29 @@
},
data() {
return {
curToken:'',
toUrl:''
}
curToken: "",
toUrl: "",
};
},
methods: {
boeLogin() {
apiLogin.boeLogin(this.curToken).then(rs=>{
apiLogin.boeLogin(this.curToken).then((rs) => {
if (rs.status == 200) {
//setToken(rs.result.access_token);
localStorage.setItem(this.$xpage.constants.newLoginKey, 1);
if (this.toUrl) {
location.href = this.toUrl;
} else {
this.$router.push({ path: "/index" })
this.$router.push({ path: "/index" });
}
//this.$router.push({ path: "/index" })
} else {
this.$message.error("登录失败:" + rs.message);
}
})
}
}
}
});
},
},
};
</script>
<style>

View File

@@ -134,7 +134,10 @@
<div>
<div style="line-height: 30px;">
<div>请在当前面板选择需要上传的课件</div>
<div style="">提示课件大小超过1G时无法上传请先压缩视频或剪切成多个再上传视频码率需在1.5Mb/s及以下帧数需在30帧及以下如果上传zip文件必须是scorm标准打包文件</div>
<div style="">提示<br>
1课件大小超过1G时无法上传请先压缩视频或剪切成多个再上传<br>
2视频码率需在1.5Mb/s及以下帧数需在30帧及以下<br>
3如果上传zip文件必须是scorm标准打包文件</div>
</div>
<div>
<div style="display: flex;line-height: 30px;padding: 5px 0px;">

View File

@@ -2,17 +2,15 @@
<div>
<!-- 最大化状态的弹窗 -->
<el-dialog
v-show=" windowState === 'maximized'"
v-if="dialogVisible"
v-if="dialogVisible && windowState === 'maximized'"
:visible="true"
:close-on-click-modal="false"
:show-close="true"
@close="onClose"
class="case-expert-dialog"
:modal="false"
:append-to-body="true"
:fullscreen="false"
top="10vh"
top="0"
v-resizeable
v-draggable
>
@@ -35,6 +33,7 @@
class="welcome-message"
ref="messageContainer"
@scroll="handleScroll"
@wheel="handleWheel"
>
<div class="message-text" v-for="(item, index) in messageList" :key="index">
<messages :messageData="item" :suggestions="suggestions" @getMinWindow="minimizeWindow"></messages>
@@ -193,7 +192,7 @@ export default {
left: parseInt(dialogEl.style.left),
top: parseInt(dialogEl.style.top)
};
sessionStorage.setItem('aiCallDialogPosition', JSON.stringify(currentPosition));
// sessionStorage.setItem('aiCallDialogPosition', JSON.stringify(currentPosition));
// 移除全局事件监听
document.removeEventListener('mousemove', handleMouseMove);
@@ -498,6 +497,9 @@ export default {
watch: {
dialogVisible: {
handler(newVal) {
console.log('dialogVisible发生变化');
console.log(newVal);
console.log(this.windowState);
if (newVal) {
this.$nextTick(() => {
// 获取对话框元素
@@ -514,12 +516,12 @@ export default {
}
// 检查是否有保存的位置状态
const savedPosition = sessionStorage.getItem('aiCallDialogPosition');
if (savedPosition) {
const { left, top } = JSON.parse(savedPosition);
dialogEl.style.left = left + 'px';
dialogEl.style.top = top + 'px';
}
// const savedPosition = sessionStorage.getItem('aiCallDialogPosition');
// if (savedPosition) {
// const { left, top } = JSON.parse(savedPosition);
// dialogEl.style.left = left + 'px';
// dialogEl.style.top = top + 'px';
// }
}
let doc = document.querySelector('.welcome-message')
@@ -566,7 +568,7 @@ closeMinimizedWindow() {
console.log('关闭弹窗')
// 清除保存的状态
sessionStorage.removeItem('aiCallDialogSize');
sessionStorage.removeItem('aiCallDialogPosition');
// sessionStorage.removeItem('aiCallDialogPosition');
this.$emit('close')
// 可以在这里执行其他逻辑
},
@@ -595,6 +597,7 @@ closeMinimizedWindow() {
// 处理加载状态
handleLoading(status) {
console.log('handleLoading---'+status);
this.isLoading = status;
},
@@ -655,6 +658,31 @@ closeMinimizedWindow() {
}
},
// 处理鼠标滚轮事件
handleWheel(event) {
const element = this.$refs.messageContainer;
if (!element) return;
// 阻止事件冒泡,防止滚动底层页面
event.stopPropagation();
// 计算滚动方向和距离
const delta = event.deltaY || event.detail || event.wheelDelta;
// 检查是否可以继续滚动
if (delta < 0 && element.scrollTop === 0) {
// 向上滚动且已在顶部,阻止默认行为
event.preventDefault();
} else if (delta > 0 && element.scrollHeight - element.scrollTop <= element.clientHeight) {
// 向下滚动且已在底部,阻止默认行为
event.preventDefault();
} else {
// 允许在容器内滚动
element.scrollTop += delta;
event.preventDefault();
}
},
// 最小化窗口的点击事件处理方法
onMinimizedWindowClick() {
// 当点击最小化窗口时如果dialogVisible为false则通过事件通知父组件显示对话框
@@ -669,6 +697,9 @@ closeMinimizedWindow() {
</script>
<style scoped lang="scss">
::v-deep .el-dialog__wrapper{
position: unset!important;
}
.case-expert-dialog {
::v-deep .el-dialog{
background: url("./components/u762.svg") no-repeat ;
@@ -677,6 +708,8 @@ closeMinimizedWindow() {
overflow: hidden;
display: flex;
flex-direction: column;
pointer-events: auto;
z-index: 2000;
//background-color: rgba(255, 255, 255, 0.8);
}

File diff suppressed because it is too large Load Diff

View File

@@ -5,7 +5,7 @@
type="textarea"
class="input-placeholder"
placeholder="有问题,尽管问"
@keyup.enter.native="handleSend"
@keyup.enter.native.prevent="handleSend"
:disabled="disabled"
:autosize="{ minRows: 2, maxRows: 4}"
resize="none"
@@ -56,7 +56,14 @@ export default {
}
},
methods: {
handleSend() {
handleSend(event) {
// 阻止事件的默认行为和冒泡
if (event) {
event.preventDefault();
event.stopPropagation();
console.log('preventDefault');
}
console.log('handleSend');
if (!this.inputContent.trim() || this.disabled) return
// 添加用户消息到列表
const userMessage = {

View File

@@ -2590,7 +2590,7 @@ a.custom2 {
}
.course-tags {
margin: 5px 0;
margin: 10px 0 0;
min-height: 20px;
}

View File

@@ -2477,6 +2477,10 @@ export default {
background-color: #f4f4f5;
border-color: #e9e9eb;
}
.course-tags {
margin: 10px 0 0;
min-height: 20px;
}
.course-tags ::v-deep .el-tag .keyword-highlight,
.course-tags ::v-deep .el-tag .exact-match-highlight {
color: #387DF7 !important;

File diff suppressed because it is too large Load Diff