Compare commits

..

122 Commits

Author SHA1 Message Date
xu
7bbc3904e0 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 16:17:27 +08:00
xu
3d7ca1cc20 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。 2025-11-11 16:16:41 +08:00
xu
b529695751 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 16:07:13 +08:00
xu
ebae7f6c0b 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。并修改页面样式,让表格可以左右滚动显示完整。 2025-11-11 16:06:32 +08:00
xu
16355a1e5e Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 15:30:49 +08:00
xu
91f06d4ed6 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。并修改页面样式,让表格可以左右滚动显示完整。 2025-11-11 15:30:20 +08:00
xu
4ee084cff2 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 14:56:15 +08:00
xu
9b3b3b94ef 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。并修改页面样式,让表格可以左右滚动显示完整。 2025-11-11 14:49:14 +08:00
xu
427ff20531 Revert "【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。"
This reverts commit 6c5e189448.
2025-11-07 15:48:21 +08:00
xu
43aaeabf99 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-07 15:20:11 +08:00
xu
6c5e189448 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。 2025-11-05 15:49:29 +08:00
670788339
38fe26c146 Merge branch 'master-20251023-tag' into test1024 2025-11-05 14:38:33 +08:00
670788339
27e3f37033 课程库标签样式 2025-11-04 19:07:16 +08:00
670788339
f5ac82769f 课程库标签样式 2025-11-04 19:00:01 +08:00
670788339
ce4be998a4 Merge branch 'master-20251023-tag' into test1024 2025-11-04 18:50:55 +08:00
670788339
2f034447b6 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/components/Course/courseTag.vue
#	src/views/portal/course/Index.vue
2025-11-04 18:45:49 +08:00
670788339
8524f7ec6f 样式调整 2025-11-04 18:32:10 +08:00
670788339
3f108ab9b7 样式调整 2025-11-04 18:26:11 +08:00
670788339
9c3b1f8857 样式调整 2025-11-04 18:19:04 +08:00
670788339
57c01d2519 样式调整 2025-11-04 18:08:29 +08:00
670788339
e9f872dd07 样式调整 2025-11-04 17:59:54 +08:00
670788339
3a5462465b 样式调整 2025-11-04 17:54:31 +08:00
670788339
fb2e07cea3 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/views/portal/course/Index.vue
2025-11-04 17:46:41 +08:00
670788339
24de64d8e5 样式调整 2025-11-04 17:28:45 +08:00
陈昱达
86ec8138dd feat(ai-call):优化对话框拖拽与缩放功能- 增强对话框拖拽逻辑,防止事件冒泡
- 完善对话框缩放功能,动态调整欢迎消息区域高度
- 修正机器人欢迎文本中的错别字
- 调整消息列表区域样式,优化滚动条显示
- 监听对话框可见性变化,确保内容正确渲染
2025-11-04 17:18:38 +08:00
670788339
bc15ec9e21 Merge branch 'master-20251023-tag' into test1024 2025-11-04 17:17:15 +08:00
670788339
79040580a1 样式调整 2025-11-04 17:03:23 +08:00
Caojr
4b2285a6f9 Merge branch '20251104-1282-fix-gj' into test1024 2025-11-04 15:54:31 +08:00
670788339
a15c8510c2 Merge branch 'master-20251023-tag' into test1024 2025-11-04 15:29:37 +08:00
joshen
109122f1c1 Merge remote-tracking branch '121/test1024' into test1024 2025-11-04 15:01:33 +08:00
joshen
6d6d0e4539 Merge remote-tracking branch 'aliyun/test1024_new' into test1024 2025-11-04 15:00:54 +08:00
Caojr
5e561930e1 Merge branch '20251104-1282-fix-gj' into test1024 2025-11-04 14:55:29 +08:00
670788339
556eaea825 调试 2025-11-04 14:53:19 +08:00
670788339
2fd3ac0de2 调试 2025-11-04 14:48:10 +08:00
670788339
bbafde31b5 调试 2025-11-04 14:30:12 +08:00
670788339
3eae32b617 调试 2025-11-04 14:20:35 +08:00
670788339
dfdba51202 Merge remote-tracking branch '121/test1024' into test1024 2025-11-04 13:50:08 +08:00
670788339
0b5d0e3180 调试 2025-11-04 13:49:44 +08:00
Caojr
9bc6af207b Merge branch '20251104-1282-fix-gj' into test1024 2025-11-04 13:47:37 +08:00
670788339
8711bbaabb 调试 2025-11-04 13:13:11 +08:00
670788339
a25198f80f 调试 2025-11-04 12:41:09 +08:00
670788339
cc7801d42d 调试 2025-11-04 12:26:35 +08:00
670788339
ef868f8165 调试 2025-11-04 12:13:27 +08:00
670788339
417d911f5d 调试 2025-11-04 12:06:58 +08:00
670788339
aa1301575e 调试 2025-11-04 12:03:05 +08:00
670788339
2a633e25e5 调试 2025-11-04 11:27:55 +08:00
670788339
81b8ef168c 调整 2025-11-04 11:19:32 +08:00
670788339
7f587138ff 调整日志 2025-11-04 11:01:50 +08:00
670788339
973e3f947d 调整日志 2025-11-04 10:23:30 +08:00
670788339
6afc19d21c 调整日志 2025-11-04 10:08:26 +08:00
670788339
305a5481c8 调整日志 2025-11-04 10:02:27 +08:00
670788339
01bbe6c5c4 调整 2025-11-04 09:53:18 +08:00
670788339
be10b56885 调整 2025-11-04 09:46:23 +08:00
670788339
b2458b6b92 调整 2025-11-04 09:43:05 +08:00
670788339
f7d247dca2 调整 2025-11-04 09:38:43 +08:00
670788339
560d180583 调整 2025-11-04 09:26:20 +08:00
670788339
e9953f2ac6 调整 2025-11-04 09:06:05 +08:00
670788339
b2908ba75e 调整 2025-11-04 09:02:33 +08:00
670788339
d087082613 调整 2025-11-04 08:58:20 +08:00
陈昱达
f8c6f55e73 feat(portal/case): 增强AI对话窗口交互功能
-为sendMessage组件添加textarea输入框,支持多行输入
- 为AI对话窗口添加拖拽和调整大小功能
- 在最小化窗口中添加关闭按钮- 优化窗口样式和布局,提升用户体验
- 添加拖拽手柄和窗口控制按钮
- 实现窗口位置和大小的动态调整
- 引入open.png图标用于最小化窗口操作
2025-11-04 06:59:05 +08:00
670788339
f0ea689166 调整 2025-11-03 19:19:39 +08:00
670788339
5b2a6d304c 调整 2025-11-03 19:15:50 +08:00
670788339
44ccf8db6d 调整 2025-11-03 19:10:51 +08:00
670788339
5f42a95f47 调整 2025-11-03 19:06:22 +08:00
670788339
b0bc517936 调整 2025-11-03 18:58:33 +08:00
670788339
897684b4f2 调整 2025-11-03 18:53:40 +08:00
670788339
c9185722f8 调整 2025-11-03 18:48:08 +08:00
670788339
f43a03b661 调整 2025-11-03 18:43:57 +08:00
670788339
69294e0d49 Merge branch 'master-20251023-tag' into test1024 2025-11-03 18:38:02 +08:00
670788339
b00e2c80b0 还原 2025-11-03 13:24:48 +08:00
670788339
a901e488b4 标签清除调试 2025-11-03 12:14:31 +08:00
670788339
512144d7d7 标签清除调试 2025-11-03 12:07:24 +08:00
670788339
fd85b8b5d0 标签清除调试 2025-11-03 11:06:37 +08:00
670788339
d1d65d41ca 标签清除调试 2025-11-03 10:43:39 +08:00
670788339
526e5e0e48 标签清除调试 2025-11-03 10:24:47 +08:00
670788339
cee45f82cb 调试 2025-11-02 17:36:52 +08:00
670788339
4b668cf186 调试 2025-11-02 17:27:51 +08:00
670788339
a656c27e24 还原 2025-11-02 17:20:31 +08:00
670788339
743478655e 调试 2025-11-02 17:15:30 +08:00
670788339
f07ef38cd5 调试 2025-11-02 17:06:37 +08:00
670788339
47ab19db7e Merge branch 'master-20251023-tag' into test1024 2025-11-02 15:28:49 +08:00
670788339
254344a528 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/components/Course/courseTag.vue
2025-11-02 10:23:41 +08:00
670788339
55b8ee7840 标签调整 2025-11-02 09:35:11 +08:00
670788339
109d154387 Merge branch 'master-20251023-tag' into test1024 2025-11-01 15:04:50 +08:00
670788339
e48cb36917 Merge branch 'master-20251023-tag' into test1024 2025-10-31 20:20:14 +08:00
670788339
79cd4d2e03 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/components/Course/courseForm.vue
2025-10-31 19:09:58 +08:00
670788339
cc4909897b 调试 2025-10-31 18:42:29 +08:00
670788339
2e7fa1cc2e 调试 2025-10-31 18:36:22 +08:00
670788339
dfc22479bb Merge branch 'master-20251023-tag' into test1024 2025-10-31 18:23:34 +08:00
670788339
ac788d59f3 Merge branch 'master-20251023-tag' into test1024 2025-10-31 18:11:04 +08:00
670788339
4f74216c6e JavaScript heap out of memory 2025-10-31 17:54:17 +08:00
670788339
a5279210c7 JavaScript heap out of memory 2025-10-31 17:49:07 +08:00
670788339
e0db15c85d Merge branch 'master-20251023-tag' into test1024 2025-10-31 17:00:48 +08:00
670788339
b38a4768a6 热点标签+保存标签调试 2025-10-31 16:45:48 +08:00
670788339
63439cb57f Merge branch 'master-20251023-tag' into test1024 2025-10-31 16:38:54 +08:00
Caojr
478890ff09 Merge branch '20251031-1280-fix-gj' into test1024 2025-10-31 16:17:30 +08:00
670788339
b18f9d132b Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/views/portal/course/Index.vue
2025-10-31 15:57:42 +08:00
670788339
a1047420fb 热点标签 2025-10-31 15:47:36 +08:00
670788339
7b02644cde Merge branch 'master-20251023-tag' into test1024 2025-10-31 14:59:27 +08:00
670788339
2f6e38430e Merge branch 'master-20251023-tag' into test1024 2025-10-31 13:35:21 +08:00
670788339
6a875182d7 Merge branch 'master-20251023-tag' into test1024 2025-10-31 11:14:07 +08:00
670788339
a7ccf26932 标签输入框下拉调整 日志 2025-10-30 20:12:33 +08:00
670788339
a2760f2ec6 Merge branch 'master-20251023-tag' into test1024 2025-10-30 20:08:58 +08:00
670788339
5d8f9874c8 Merge branch 'master-20251023-tag' into test1024 2025-10-30 19:44:40 +08:00
670788339
fbf3b19e40 Merge branch 'master-20251023-tag' into test1024 2025-10-30 19:11:01 +08:00
670788339
1d2d20acb0 Merge branch 'master-20251023-tag' into test1024 2025-10-30 15:43:52 +08:00
670788339
3cc0f690a4 Merge branch 'master-20251023-tag' into test1024 2025-10-30 14:12:44 +08:00
670788339
0d01f7da86 Merge branch 'master-20251023-tag' into test1024 2025-10-29 15:28:14 +08:00
670788339
803d9c2dbb Merge branch 'master-20251023-tag' into test1024 2025-10-29 14:59:55 +08:00
670788339
101ebdbbad Merge branch 'master-20251023-tag' into test1024 2025-10-29 14:55:16 +08:00
670788339
1b47071a99 Merge remote-tracking branch '121/test1024' into test1024 2025-10-28 16:52:53 +08:00
joshen
8a39d424a2 纠正 setup 错误的问题 2025-10-28 16:40:57 +08:00
joshen
43a8ae3606 Merge remote-tracking branch 'yx/20250922-cyd' into test1024 2025-10-28 16:19:49 +08:00
joshen
ebf99e8a7f Merge remote-tracking branch '121-git/test1024' into test1024 2025-10-24 10:01:50 +08:00
陈昱达
6d37310bc4 feat(portal): 添加消息组件最小化窗口功能
- 在消息组件中新增 getMinWindow事件触发
- 在 AI 呼叫页面监听并处理最小化事件
- 实现窗口状态管理,支持最小化显示
-优化组件间通信逻辑,确保状态同步准确- 修复可能引起状态异常的注释代码问题- 调整样式以适配最小化窗口显示效果
2025-10-24 10:00:45 +08:00
陈昱达
f9675b1ab7 更新lock 2025-10-24 10:00:41 +08:00
陈昱达
ed6fb14367 feat(case): 支持消息内容Markdown渲染并优化样式
- 消息内容支持Markdown格式渲染
- 注释掉推荐问题模块,暂时不显示
- 调整消息气泡样式,去除背景色和边框
- 修改消息气泡圆角大小,提升视觉效果
- 调整链接颜色为黑色,增强可读性- 提高打字机效果速度,改善用户体验
2025-10-24 10:00:36 +08:00
陈昱达
ee43ea7b0c fix(portal): 禁用消息组件中的打字机效果
- 注释掉了启动打字机效果的函数调用
- 直接设置显示文本以避免延迟
2025-10-24 10:00:33 +08:00
陈昱达
83bda2e8a5 feat(portal):优化AI对话框宽度与消息展示
- 将AI对话框宽度从65%调整为800px- 修改初始欢迎消息格式,使用HTML标签替换Markdown语法-修复机器人消息显示逻辑,确保displayText正确赋值- 优化消息渲染流程,提升用户体验
2025-10-24 10:00:28 +08:00
陈昱达
90622d6ebc feat(portal): 实现消息组件支持 Mermaid 图表渲染
- 添加 markdown-it-mermaid 插件支持 Mermaid 语法
- 集成 mermaid 库并初始化配置
- 实现打字机效果与 Mermaid 渲染结合
-优化案例引用展示逻辑与样式- 添加推荐问题展示功能
- 改进消息组件的响应式与样式细节
- 修复组件销毁时定时器未清除的问题
- 更新依赖包引入 Mermaid 相关库
2025-10-24 10:00:22 +08:00
陈昱达
b7273410a0 feat(portal): 支持消息内容的 Markdown 和 LaTeX 渲染- 引入 markdown-it 与 highlight.js 实现 Markdown 渲染- 集成 KaTeX 支持数学公式显示
- 更新消息组件以支持实时渲染 Markdown 与 LaTeX
- 调整 AI 对话框宽度为百分比布局
- 优化初始欢迎文案格式并添加段落间距
- 添加必要的依赖项:katex、markdown-it、markdown-it-highlightjs 等- 配置 vue-katex 插件并定义分隔符规则
- 使用 null-loader 处理部分资源加载问题
2025-10-24 10:00:18 +08:00
joshen
9580dd9735 添加 Accept : EventStream 请求头 2025-10-24 09:59:08 +08:00
23 changed files with 5096 additions and 7093 deletions

View File

@@ -1,5 +1,5 @@
<template>
<div id="app" style="width: 100vw">
<div id="app">
<keep-alive :include="['case']">
<router-view />
12312
@@ -87,16 +87,4 @@
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

@@ -19,57 +19,52 @@ import errorCode from '@/utils/errorCode'
// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
const TokenName = 'XBOE-Access-Token';
const TokenName='XBOE-Access-Token';
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
//用于普通的发送请求
const formRequest = axios.create({
const formRequest=axios.create({
// headers:{'Content-Type':'application/x-www-form-urlencoded'},
// axios中请求配置有baseURL选项表示请求URL公共部分
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
timeout: 60000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
//是否需要设置 token
const isToken = (config.headers || {}).isToken === false
if (getToken() && !isToken) {
config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
return config
}, error => {
}, error => {
console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
});
formRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code === 401) {
}else{
if(code === 401){
//Message({message: msg, type: 'error'});
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);
return res.data
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -89,22 +84,22 @@ formRequest.interceptors.response.use(res => {
})
return Promise.reject(error)
}
)
)
/**
* request请求,可以自定义参数
*/
const request = formRequest.request;
const request=formRequest.request;
/**
* get请求 ,只有url
*/
const get = function (baseURL, url) {
const get = function(baseURL,url){
return request({
baseURL,
url: url,
method: 'get',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
headers:{'Content-Type':'application/x-www-form-urlencoded'}
})
}
@@ -113,60 +108,60 @@ const get = function (baseURL, url) {
* @param {Object} url
* @param {Object} postData
*/
const post = function (baseURL, url, postData) {
if (postData) {
postData = qs.stringify(postData);
const post=function(baseURL,url,postData){
if(postData){
postData=qs.stringify(postData);
}
return request({
baseURL,
url: url,
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
data:postData,
headers:{'Content-Type':'application/x-www-form-urlencoded'}
})
}
//post请求
const postForm = function (baseURL, url, data) {
const postForm=function(baseURL,url,data){
return request({
baseURL,
url,
data,
method: 'post',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
headers:{'Content-Type':'application/x-www-form-urlencoded'}
});
}
}
// const postJson=jsonRequest.post;
const postJson = function (baseURL, url, postData) {
const postJson=function(baseURL,url,postData){
return request({
baseURL,
url: url,
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/json;charset=utf-8' },
data:postData,
headers:{'Content-Type':'application/json;charset=utf-8'},
})
}
const postPdf = function (baseURL, url, postData) {
const postPdf=function(baseURL,url,postData){
return request({
baseURL,
url: url,
responseType: 'blob',
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/pdf' },
data:postData,
headers:{'Content-Type':'application/pdf'},
})
}
// 导出文件请求定义
const postJsonToFile = function (baseURL, url, postData) {
const postJsonToFile=function(baseURL,url,postData){
return request({
baseURL,
url: url,
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/json;charset=utf-8' },
data:postData,
headers:{'Content-Type':'application/json;charset=utf-8'},
responseType: 'blob'
})
}
@@ -175,33 +170,33 @@ const postJsonToFile = function (baseURL, url, postData) {
/**
* put请求
*/
const put = function (baseURL, url, data) {
if (data) {
data = qs.stringify(data);
const put=function(baseURL,url,data){
if(data){
data=qs.stringify(data);
}
return request({
baseURL,
url: url,
method: 'put',
data: data,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
data:data,
headers:{'Content-Type':'application/x-www-form-urlencoded'}
})
}
const putJson = function (baseURL, url, data) {
const putJson=function(baseURL,url,data){
return request({
baseURL,
url: url,
method: 'put',
data: data,
headers: { 'Content-Type': 'application/json;charset=utf-8' },
data:data,
headers:{'Content-Type':'application/json;charset=utf-8'},
})
}
export default {
tokenName: TokenName,
tokenName:TokenName,
request,
get,
post,

View File

@@ -19,61 +19,56 @@ import errorCode from '@/utils/errorCode'
// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
const TokenName = 'token';
const TokenName='token';
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
//用于普通的发送请求
const formRequest = axios.create({
const formRequest=axios.create({
// headers:{'Content-Type':'application/x-www-form-urlencoded'},
// axios中请求配置有baseURL选项表示请求URL公共部分
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
timeout: 10000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
//是否需要设置 token
const isToken = (config.headers || {}).isToken === false
let curToken = getToken();
let curToken=getToken();
//curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
if (curToken && !isToken) {
config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
}
return config
}, error => {
}, error => {
console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
});
formRequest.interceptors.response.use(res => {
//console.log(res);
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code === 401) {
}else{
if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);
return res.data
}
}
},
},
error => {
console.log('err', error)
console.log('err',error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";
@@ -91,22 +86,22 @@ formRequest.interceptors.response.use(res => {
})
return Promise.reject(error)
}
)
)
/**
* request请求,可以自定义参数
*/
const request = formRequest.request;
const request=formRequest.request;
/**
* get请求 ,只有url
*/
const get = function (baseURL, url) {
const get = function(baseURL,url){
return request({
baseURL,
url: url,
method: 'get',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
headers:{'Content-Type':'application/x-www-form-urlencoded'}
})
}
@@ -115,48 +110,48 @@ const get = function (baseURL, url) {
* @param {Object} url
* @param {Object} postData
*/
const post = function (baseURL, url, postData) {
if (postData) {
postData = qs.stringify(postData);
const post=function(baseURL,url,postData){
if(postData){
postData=qs.stringify(postData);
}
return request({
baseURL,
url: url,
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
data:postData,
headers:{'Content-Type':'application/x-www-form-urlencoded'}
})
}
//post请求
const postForm = function (baseURL, url, data) {
const postForm=function(baseURL,url,data){
return request({
baseURL,
url,
data,
method: 'post',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
headers:{'Content-Type':'application/x-www-form-urlencoded'}
});
}
}
// const postJson=jsonRequest.post;
const postJson = function (baseURL, url, postData) {
const postJson=function(baseURL,url,postData){
return request({
baseURL,
url: url,
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/json' },
data:postData,
headers:{'Content-Type':'application/json'},
})
}
// 导出文件请求定义
const postJsonToFile = function (baseURL, url, postData) {
const postJsonToFile=function(baseURL,url,postData){
return request({
baseURL,
url: url,
method: 'post',
data: postData,
headers: { 'Content-Type': 'application/json;charset=utf-8' },
data:postData,
headers:{'Content-Type':'application/json;charset=utf-8'},
responseType: 'blob'
})
}
@@ -165,33 +160,33 @@ const postJsonToFile = function (baseURL, url, postData) {
/**
* put请求
*/
const put = function (baseURL, url, data) {
if (data) {
data = qs.stringify(data);
const put=function(baseURL,url,data){
if(data){
data=qs.stringify(data);
}
return request({
baseURL,
url: url,
method: 'put',
data: data,
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
data:data,
headers:{'Content-Type':'application/x-www-form-urlencoded'}
})
}
const putJson = function (baseURL, url, data) {
const putJson=function(baseURL,url,data){
return request({
baseURL,
url: url,
method: 'put',
data: data,
headers: { 'Content-Type': 'application/json;charset=utf-8' },
data:data,
headers:{'Content-Type':'application/json;charset=utf-8'},
})
}
export default {
tokenName: TokenName,
tokenName:TokenName,
request,
get,
post,

View File

@@ -18,13 +18,13 @@ import errorCode from '@/utils/errorCode'
*delete请求 axios.delete(url[, config])
*/
const ReLoginUrl = process.env.VUE_APP_LOGIN_URL;
const TokenName = 'token';
const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
const TokenName='token';
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
const jsonRequest = axios.create({
headers: { 'Content-Type': 'application/json;charset=utf-8' },
const jsonRequest=axios.create({
headers:{'Content-Type':'application/json;charset=utf-8'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BOE_BASE_API,
//超时
@@ -47,32 +47,27 @@ jsonRequest.interceptors.request.use(config => {
jsonRequest.interceptors.response.use(res => {
const code1 = res.data.status || 200;
const code = parseInt(code1);
if (code === 200) {
const code=parseInt(code1);
if(code===200){
return res.data
} else {
if (code == 6001) { //对方是字符串,所以这里不要使用三个等号
}else{
if(code == 6001){ //对方是字符串,所以这里不要使用三个等号
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
//return res.data;
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err:' + res.data.error);
//return Promise.reject(new Error(res.data.message))
return res.data;
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -96,8 +91,8 @@ jsonRequest.interceptors.response.use(res => {
)
//用于普通的发送请求
const formRequest = axios.create({
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
const formRequest=axios.create({
headers:{'Content-Type':'application/x-www-form-urlencoded'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BOE_BASE_API,
//超时
@@ -117,30 +112,25 @@ formRequest.interceptors.request.use(config => {
});
formRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code == 6001) { //对方是字符串,所以这里不要使用三个等号
}else{
if(code == 6001){ //对方是字符串,所以这里不要使用三个等号
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);
//return Promise.reject(new Error(res.data.message))
return res.data;//返回给用户做业务处理
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -164,44 +154,44 @@ formRequest.interceptors.response.use(res => {
)
//request请求
const request = function (cfg) {
if (cfg.data) {
cfg.data = qs.stringify(cfg.data);
const request=function(cfg){
if(cfg.data){
cfg.data=qs.stringify(cfg.data);
}
};
//requestJson请求
const requestJson = jsonRequest.request;
const requestJson=jsonRequest.request;
//get请求
const get = formRequest.request;
const get=formRequest.request;
//post请求
const post = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const post=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.post(url, data, config);
return formRequest.post(url,data,config);
}
//postJson请求
const postJson = jsonRequest.post;
const postJson=jsonRequest.post;
//put请求
const put = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const put=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.put(url, data, config);
return formRequest.put(url,data,config);
}
//putJson请求
const putJson = jsonRequest.put;
const putJson=jsonRequest.put;
//patch请求
const patch = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const patch=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.patch(url, data, config);
return formRequest.patch(url,data,config);
}
//patchJson请求
const patchJson = jsonRequest.patch;
const patchJson=jsonRequest.patch;
//delete请求
const del = formRequest.delete;
const del=formRequest.delete;
export default {

View File

@@ -17,12 +17,12 @@ import errorCode from '@/utils/errorCode'
*delete请求 axios.delete(url[, config])
*/
const ReLoginUrl = "/login";
const TokenName = 'XBOE-Access-Token';
const ReLoginUrl="/login";
const TokenName='XBOE-Access-Token';
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
const jsonRequest = axios.create({
headers: { 'Content-Type': 'application/json;charset=utf-8' },
const jsonRequest=axios.create({
headers:{'Content-Type':'application/json;charset=utf-8'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
@@ -45,30 +45,25 @@ jsonRequest.interceptors.request.use(config => {
jsonRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code === 401) {
}else{
if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err:' + res.data.error);
return res.data;
//return Promise.reject(new Error(res.data.message))
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -91,8 +86,8 @@ jsonRequest.interceptors.response.use(res => {
)
//用于普通的发送请求
const formRequest = axios.create({
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
const formRequest=axios.create({
headers:{'Content-Type':'application/x-www-form-urlencoded'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
@@ -112,29 +107,24 @@ formRequest.interceptors.request.use(config => {
});
formRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code === 401) {
}else{
if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);
return res.data
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -157,44 +147,44 @@ formRequest.interceptors.response.use(res => {
)
//request请求
const request = function (cfg) {
if (cfg.data) {
cfg.data = qs.stringify(cfg.data);
const request=function(cfg){
if(cfg.data){
cfg.data=qs.stringify(cfg.data);
}
};
//requestJson请求
const requestJson = jsonRequest.request;
const requestJson=jsonRequest.request;
//get请求
const get = formRequest.request;
const get=formRequest.request;
//post请求
const post = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const post=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.post(url, data, config);
return formRequest.post(url,data,config);
}
//postJson请求
const postJson = jsonRequest.post;
const postJson=jsonRequest.post;
//put请求
const put = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const put=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.put(url, data, config);
return formRequest.put(url,data,config);
}
//putJson请求
const putJson = jsonRequest.put;
const putJson=jsonRequest.put;
//patch请求
const patch = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const patch=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.patch(url, data, config);
return formRequest.patch(url,data,config);
}
//patchJson请求
const patchJson = jsonRequest.patch;
const patchJson=jsonRequest.patch;
//delete请求
const del = formRequest.delete;
const del=formRequest.delete;
export default {

View File

@@ -17,12 +17,12 @@ import errorCode from '@/utils/errorCode'
*delete请求 axios.delete(url[, config])
*/
const ReLoginUrl = "/login";
const TokenName = 'XBOE-Access-Token';
const ReLoginUrl="/login";
const TokenName='XBOE-Access-Token';
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
const jsonRequest = axios.create({
headers: { 'Content-Type': 'application/json;charset=utf-8' },
const jsonRequest=axios.create({
headers:{'Content-Type':'application/json;charset=utf-8'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_STAT_BASE_API,
//超时
@@ -45,30 +45,25 @@ jsonRequest.interceptors.request.use(config => {
jsonRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code === 401) {
}else{
if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err:' + res.data.error);
return res.data;
//return Promise.reject(new Error(res.data.message))
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -91,8 +86,8 @@ jsonRequest.interceptors.response.use(res => {
)
//用于普通的发送请求
const formRequest = axios.create({
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
const formRequest=axios.create({
headers:{'Content-Type':'application/x-www-form-urlencoded'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_STAT_BASE_API,
//超时
@@ -112,29 +107,24 @@ formRequest.interceptors.request.use(config => {
});
formRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code === 401) {
}else{
if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = this.webBaseUrl + ReLoginUrl;
} else {
window.location.href = this.webBaseUrl + ReLoginUrl;
}
// location.href = this.webBaseUrl + ReLoginUrl;
location.href = this.webBaseUrl + ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else {
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);
return res.data
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -157,44 +147,44 @@ formRequest.interceptors.response.use(res => {
)
//request请求
const request = function (cfg) {
if (cfg.data) {
cfg.data = qs.stringify(cfg.data);
const request=function(cfg){
if(cfg.data){
cfg.data=qs.stringify(cfg.data);
}
};
//requestJson请求
const requestJson = jsonRequest.request;
const requestJson=jsonRequest.request;
//get请求
const get = formRequest.request;
const get=formRequest.request;
//post请求
const post = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const post=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.post(url, data, config);
return formRequest.post(url,data,config);
}
//postJson请求
const postJson = jsonRequest.post;
const postJson=jsonRequest.post;
//put请求
const put = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const put=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.put(url, data, config);
return formRequest.put(url,data,config);
}
//putJson请求
const putJson = jsonRequest.put;
const putJson=jsonRequest.put;
//patch请求
const patch = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const patch=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.patch(url, data, config);
return formRequest.patch(url,data,config);
}
//patchJson请求
const patchJson = jsonRequest.patch;
const patchJson=jsonRequest.patch;
//delete请求
const del = formRequest.delete;
const del=formRequest.delete;
export default {

View File

@@ -440,12 +440,6 @@ const queryCrowd=function(query){
const ids=function (data){
return ajax.postJson('/xboe/m/course/manage/ids',data);
}
const saveTip = function() {
return ajax.postJson('/xboe/m/course/manage/saveTip');
}
export default {
saveBase,
submitCourse,
@@ -488,7 +482,6 @@ export default {
exportCourseAudit,
exportCourse,
queryCrowd,
ids,
saveTip
ids
}

View File

@@ -41,43 +41,6 @@
<el-button @click="toInputCourse()" type="primary">确定</el-button>
</span> -->
</el-dialog>
<!-- 蒙层引导组件 -->
<div v-if="showGuidance" class="guidance-overlay" @click="closeGuidance">
<div class="guidance-content">
<div class="guidance-title"></div> <!--新功能引导-->
<div class="guidance-steps">
<div class="guidance-step" :class="{ active: currentStep === 1 }">
<div class="step-number"></div>
<div class="step-content">
<div class="step-title">用标签为课程精准定位吸引更多学员可从以下维度构思</div>
<div class="step-desc" style="padding-left: 20px;"> 讲领域品质管理</div>
<div class="step-desc" style="padding-left: 20px;"> 教技能沟通技巧</div>
<div class="step-desc" style="padding-left: 20px;"> 涉内容5W1H分析法</div>
</div>
</div>
<!-- <div class="guidance-step" :class="{ active: currentStep === 2 }">
<div class="step-number">2</div>
<div class="step-content">
<div class="step-title">添加课程标签</div>
<div class="step-desc">为课程添加相关标签,最多5个便于搜索和分类,可回车创建新标签</div>
</div>
</div>-->
</div>
<!-- <div class="guidance-actions">
<el-button @click="previousStep1" v-if="currentStep > 1">上一步</el-button>
<el-button type="primary" @click="nextStep">
{{ currentStep === 2 ? '完成' : '下一步' }}
</el-button>
<el-button @click="closeGuidance">跳过引导</el-button>
</div>-->
</div>
</div>
<!-- 高亮指引元素 -->
<!-- <div v-if="showGuidance" class="highlight-element" :style="highlightStyle"></div>-->
<!--微课-->
<el-dialog v-if="weike.dlgShow" width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="weike.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8vh">
<el-form label-width="100px" size="small" class="wei-from" style="min-height: 600px;">
@@ -101,29 +64,18 @@
</span>
</div>
</el-form-item>
<el-form-item label="内容分类" required >
<el-form-item label="内容分类" required>
<el-cascader
placeholder="选择内容分类"
style="width: 100%;"
clearable
v-model="sysTypeList"
:props="{ value: 'id', label: 'name' }"
:options="sysTypeListMap"
@focus="onContentTypeFocus"
@change="onContentTypeChange">
</el-cascader>
:options="sysTypeListMap"></el-cascader>
</el-form-item>
<el-form-item label="标签" required class="guidance-highlight" data-step="1" style="display: flex" >
<courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList"
:initialTags="courseTags" @change="handleTagsChange"
@focus="onTagFocus" style="width: 95%;">
</courseTag>
<el-tooltip content="点击查看标签新功能引导" placement="top">
<i class="el-icon-question" style="color: #409EFF; cursor: pointer;" @click="handleTagHelp"></i>
</el-tooltip>
<el-form-item label="标签" required>
<courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
</el-form-item>
<el-form-item label="资源归属" required>
<el-input placeholder="请选择" v-model="orgName" >
<el-button v-if="identity==3 || identity==5" @click="showChooseOrg()" slot="append" icon="el-icon-search">选择</el-button>
@@ -269,16 +221,14 @@
</div>
</el-col>
<el-col :span="12">
<el-form-item label="内容分类" required >
<el-form-item label="内容分类" required>
<el-cascader
placeholder="选择内容分类"
style="width: 100%;"
clearable
v-model="sysTypeList"
:props="{ value: 'id', label: 'name' }"
:options="sysTypeListMap"
@focus="onContentTypeFocus"
@change="onContentTypeChange">
:options="sysTypeListMap">
</el-cascader>
</el-form-item>
@@ -306,16 +256,9 @@
</el-select> -->
<choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
</el-form-item>
<el-form-item label="标签" required class="tag-from-item" data-step="1" >
<courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList"
:initialTags="courseTags" @change="handleTagsChange"
@focus="onTagFocus" >
</courseTag>
<el-tooltip content="点击查看标签新功能引导" placement="top">
<i class="el-icon-question" style="color: #409EFF; cursor: pointer;" @click="handleTagHelp"></i>
</el-tooltip>
<el-form-item label="标签" required>
<courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
</el-form-item>
<el-form-item label="关键字">
<el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords" placeholder="请输入关键字"></el-input>
<el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
@@ -593,13 +536,7 @@ export default {
dlgShow: false
},
rightTypeId: {},
catalogSortDialogShow: false,
// 蒙层引导相关数据
showGuidance: false,
currentStep: 1,
highlightStyle: {},
guidanceElements: [],
isFirstCreate: false, // 标记是否为首次创建
catalogSortDialogShow: false
};
},
created() {
@@ -653,9 +590,6 @@ export default {
this.loadUserGroup();
},
methods: {
handleTagHelp(){
this.checkAndShowGuidance();
},
// 关键字的更改
changeKeywords(option){
if(option.target.value){
@@ -915,7 +849,7 @@ export default {
},
resetCurCourseContent() {
this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentRefId: '', courseId: this.courseInfo.id };
this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentName: '', contentRefId: '', courseId: this.courseInfo.id };
},
// chooseCourseType(item, idx, open) {
// this.courseChooseId = item.id;
@@ -963,106 +897,19 @@ export default {
this.courseInfo = rs.result;
this.curCourseId = this.courseInfo.id
console.log('保存课程成功',this.curCourseId)
console.log('isTip ',this.courseInfo.isTip)
// if(this.courseInfo.isTip){
// // 检查是否为首次创建,显示引导
// this.checkAndShowGuidance();
// }
if (this.courseChooseId == 1) {
this.weike.dlgShow = true;
} else {
this.biaoke.dlgShow = true;
}
// this.$nextTick(() => {
// this.initTagComponent();
// // 如果显示引导,初始化高亮元素
// if (this.showGuidance) {
// this.$nextTick(() => {
// this.initGuidanceElements();
// this.highlightCurrentStep();
// });
// }
// });
this.$nextTick(() => {
this.initTagComponent();
});
} else {
this.$message.error(rs.message);
}
});
},
// 检查并显示引导
checkAndShowGuidance() {
// 检查本地存储,判断是否为首次创建
// const hasShownGuidance = localStorage.getItem('course_creation_guidance_shown');
// if (!hasShownGuidance) {
this.showGuidance = true;
this.currentStep = 1;
this.isFirstCreate = true;
// 标记引导已显示
localStorage.setItem('course_creation_guidance_shown', 'true');
// apiCourse.saveTip();
// }
},
// 初始化引导元素
initGuidanceElements() {
this.guidanceElements = Array.from(document.querySelectorAll('.guidance-highlight'));
},
// 高亮当前步骤对应的元素
highlightCurrentStep() {
if (this.guidanceElements.length === 0) return;
const currentElement = this.guidanceElements[this.currentStep - 1];
if (currentElement) {
currentElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
},
// 下一步
nextStep() {
if (this.currentStep < 2) {
this.currentStep++;
this.highlightCurrentStep();
} else {
this.closeGuidance();
}
},
// 上一步
previousStep1() {
if (this.currentStep > 1) {
this.currentStep--;
this.highlightCurrentStep();
}
},
// 关闭引导
closeGuidance() {
this.showGuidance = false;
this.currentStep = 1;
this.highlightStyle = {};
},
// 内容分类获得焦点时的处理
onContentTypeFocus() {
if (this.showGuidance && this.currentStep === 1) {
this.currentStep = 2;
this.highlightCurrentStep();
}
},
// 内容分类改变时的处理
onContentTypeChange() {
if (this.showGuidance && this.currentStep === 1) {
this.currentStep = 2;
this.highlightCurrentStep();
}
},
// 标签获得焦点时的处理
onTagFocus() {
if (this.showGuidance && this.currentStep === 2) {
this.closeGuidance();
}
},
// 新增初始化标签方法
initTagComponent() {
if (this.$refs.courseTag) {
@@ -1969,126 +1816,4 @@ export default {
}
}
}
/* 蒙层样式 */
.guidance-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.6);
z-index: 9999;
display: flex;
justify-content: center;
align-items: center;
}
.guidance-content {
position: fixed;
background: white;
border-radius: 8px;
padding: 24px;
max-width: 500px;
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
z-index: 10000;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.guidance-title {
font-size: 18px;
font-weight: bold;
margin-bottom: 20px;
text-align: center;
}
.guidance-steps {
margin-bottom: 20px;
}
.guidance-step {
display: flex;
align-items: flex-start;
margin-bottom: 16px;
opacity: 0.5;
transition: opacity 0.3s;
}
.guidance-step.active {
opacity: 1;
}
.step-number {
//width: 24px;
height: 24px;
//background: #409EFF;
color: white;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin-right: 12px;
font-size: 14px;
}
.step-content {
flex: 1;
}
.step-title {
font-weight: bold;
margin-bottom: 4px;
}
.step-desc {
color: #666;
font-size: 14px;
}
.guidance-actions {
display: flex;
justify-content: center;
gap: 12px;
}
/* 高亮元素样式 */
.highlight-element {
position: fixed;
border: 2px solid #409EFF;
border-radius: 4px;
box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.4), 0 0 15px rgba(64, 158, 255, 0.5);
z-index: 9998;
pointer-events: none;
transition: all 0.3s ease;
}
/* 被高亮元素的样式 */
.guidance-highlight {
position: relative;
z-index: 10001;
}
//.el-form-item__content {
// display: flex;
// width: 80%;
// .tag-container {
// width: 95%;
// }
//}
.tag-from-item .el-form-item__content {
margin-left: 0 !important;
display: flex;
//align-items: center;
.tag-container {
width: 95%;
}
}
.guidance-highlight .el-form-item__content {
margin-left: 0 !important;
display: flex;
width: 75%;
}
</style>

View File

@@ -1,5 +1,6 @@
<template>
<div class="tag-container" @click="handleContainerClick">
<div class="tag-container">
<el-select style="width: 100%;"
v-model="selectedTags"
multiple
@@ -10,7 +11,6 @@
:remote-method="debouncedSearch"
:loading="loading"
:placeholder="'回车创建新标签'"
:no-data-text="'无此标签,按回车键创建'"
@remove-tag="handleTagRemove"
@change="handleSelectionChange"
@keyup.enter.native="handleEnterKey"
@@ -141,11 +141,6 @@ export default {
if (this.sysTypeList.length > 0) {
await this.doSearch('');
}
this.$emit('focus');
},
handleContainerClick() {
// 容器点击时也触发焦点事件
this.$emit('focus');
},
// 新增:重置标签状态的方法
resetTagState() {
@@ -217,9 +212,6 @@ export default {
this.$emit('change', this.displayTags);
this.clearInput();
this.$nextTick(() => {
this.$refs.tagSelect.visible = false;
});
},
clearInput() {
@@ -321,7 +313,7 @@ export default {
this.searchResults = tags
// 当搜索结果为空时,提示用户可以按回车键创建标签
if (tags.length === 0) {
// this.$message.info('无此标签,按回车键创建')
this.$message.info('无此标签,按回车键创建')
}
} finally {
this.loading = false
@@ -367,9 +359,8 @@ export default {
flex-wrap: wrap;
align-items: center;
}
/*
::v-deep(.el-tag) {
flex: 0 0 calc(50% - 8px);
max-width: calc(50% - 8px);
box-sizing: border-box;
margin-right: 8px;
@@ -377,20 +368,6 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}*/
::v-deep(.el-tag) {
flex: 1 1 auto; /* 自动调整宽度 */
min-width: 30%; /* 设置最小宽度 */
max-width: 48%; /* 设置最大宽度,留出边距 */
box-sizing: border-box;
margin-right: 8px;
margin-bottom: 4px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
justify-content: center;
text-align: center;
}
::v-deep(.el-select__input) {

View File

@@ -1,110 +1,55 @@
<template>
<div class="portal-header">
<div class="portal-top" :style="{ color: textColor }">
<div class="portal-top" :style="{color:textColor}">
<div class="portal-top-left">
<div class="portal-top-logo">
<img
src="../assets/logo/logo-white.png"
v-if="textColor == '#fff' || textColor == '#ffffff'"
style="width: 160px; height: 27px"
/>
<img
src="../assets/logo/logo.png"
v-else
style="width: 160px; height: 27px"
/>
<img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
<img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
</div>
<div class="portal-top-nav" v-if="userInfo.role === 1">
<div
class="top-nav"
:style="{ color: textColor }"
:class="current == 'index' ? activeNav : ''"
>
<router-link to="/index"
>首页
<div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
<router-link to="/index" >首页
<div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
</router-link>
</div>
<div
class="top-nav"
:style="{ color: textColor }"
:class="current == 'course' ? activeNav : ''"
>
<a @click="handleChangeCourse"
>课程
<div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
<a @click="handleChangeCourse">课程
<div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
</a>
</div>
<div
class="top-nav"
:style="{ color: textColor }"
:class="current == 'case' ? activeNav : ''"
>
<router-link to="/case"
>案例
<div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
<router-link to="/case">案例
<div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
</router-link>
</div>
<div
class="top-nav"
:style="{ color: textColor }"
:class="current == 'article' ? activeNav : ''"
>
<router-link to="/article"
>文章
<div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? activeNav : ''">
<router-link to="/article">文章
<div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
</router-link>
</div>
<div
class="top-nav"
:style="{ color: textColor }"
:class="current == 'qa' ? activeNav : ''"
>
<router-link to="/qa"
>问答
<div class="top-nav" :style="{color:textColor}" :class="current == 'qa' ? activeNav : ''">
<router-link to="/qa" >问答
<div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
</router-link>
</div>
<div class="top-nav">
<el-dropdown placement="bottom" @command="handleCommand">
<span
class="el-dropdown-link"
style="font-size: 16px; cursor: pointer"
:style="{ color: textColor }"
>专区</span
>
<span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="zero">热点论坛</el-dropdown-item>
<el-dropdown-item command="one" divided
>BOE系列公开课</el-dropdown-item
>
<el-dropdown-item command="two" divided
>Grow180</el-dropdown-item
>
<el-dropdown-item command="three" divided
>管理者进阶</el-dropdown-item
>
<el-dropdown-item command="four" divided
>U选小课堂</el-dropdown-item
>
<el-dropdown-item command="five" divided
>社招新员工</el-dropdown-item
>
<el-dropdown-item command="one" divided>BOE系列公开课</el-dropdown-item>
<el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
<el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item>
<el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item>
<el-dropdown-item command="five" divided>社招新员工</el-dropdown-item>
<!-- <el-dropdown-item command="six" divided>贡献者专区</el-dropdown-item> -->
<el-dropdown-item command="seven" divided
>教师专区</el-dropdown-item
>
<el-dropdown-item command="seven" divided>教师专区</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="top-nav">
<el-dropdown placement="bottom" @command="handleContributor">
<span
class="el-dropdown-link"
style="font-size: 16px; cursor: pointer"
:style="{ color: textColor }"
>贡献者大会</span
>
<span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="three">2024</el-dropdown-item>
<el-dropdown-item command="one" divided>2023</el-dropdown-item>
@@ -113,40 +58,18 @@
</el-dropdown>
</div>
<div
class="top-nav"
:style="{ color: textColor }"
:class="current == 'follow' ? activeNav : ''"
>
<router-link to="/follow"
>我的关注
<div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
<router-link to="/follow">我的关注
<div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
</router-link>
</div>
</div>
</div>
<div class="portal-top-right">
<div
v-if="goSearch != 10 && userInfo.role === 1"
style="position: relative"
>
<el-input
class="portal-input"
v-show="!hideSearch"
placeholder="搜索全部"
style="border-radius: 20px !important"
@keyup.enter.native="searchJump()"
clearable
maxlength="50"
v-model="keyword"
>
<el-select
v-if="current == 'index'"
v-model="findType"
style="width: 75px; border-radius: 20px !important"
slot="prepend"
placeholder="请选择"
>
<div v-if="goSearch !=10 && userInfo.role === 1" style="position: relative;">
<el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
<el-select v-if="current == 'index'" v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
<el-option label="课程" value="1"></el-option>
<el-option label="案例" value="2"></el-option>
<el-option label="文章" value="3"></el-option>
@@ -154,14 +77,7 @@
<!-- <el-option label="专区" value="5"></el-option> -->
</el-select>
</el-input>
<el-button
v-show="!hideSearch"
class="sear-but"
@click="searchJump()"
type="primary"
size="mini"
>搜索</el-button
>
<el-button v-show="!hideSearch" class="sear-but" @click="searchJump()" type="primary" size="mini">搜索</el-button>
</div>
<div class="person-action">
@@ -170,25 +86,11 @@
<el-link v-else class="person-action-index" type="primary" style="margin-right:10px; color:#fff;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link> -->
<!-- <el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link> -->
<div class="person-action-item">
<el-badge
class="person-action-index"
:value="userMsg"
:hidden="userMsg == 0"
>
<el-tooltip
content="消息"
placement="bottom"
effect="light"
:visible-arrow="false"
popper-class="text-tooltip"
>
<el-badge class="person-action-index" :value="userMsg" :hidden="userMsg == 0">
<el-tooltip content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
<!-- <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false"> -->
<router-link to="/message/center/index">
<svg-icon
:style="{ color: textColor }"
style="margin-right: 0; font-size: 22px"
icon-class="messfff"
></svg-icon>
<svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
</router-link>
<!-- </el-link> -->
</el-tooltip>
@@ -197,94 +99,40 @@
<div class="person-action-item">
<el-dropdown class="person-action-index">
<span class="el-dropdown-link">
<span :style="{ color: textColor }">学员</span>
<i
:style="{ color: textColor }"
class="el-icon-arrow-down el-icon--right"
></i>
<span :style="{color:textColor}">学员</span>
<i :style="{color:textColor}" class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
><router-link to="/index">学员</router-link></el-dropdown-item
>
<el-dropdown-item
v-if="identity == 2 || identity == 5"
@click.native="setCurIdentity(2)"
><router-link to="/need/waitaudit"
>教师</router-link
></el-dropdown-item
>
<el-dropdown-item v-if="identity == 3 || identity == 5"
><a :href="managerPath + '/learningpath'"
>管理员</a
></el-dropdown-item
>
<el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
<el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
<el-dropdown-item v-if="identity == 3 || identity == 5" ><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="person-action-item">
<el-dropdown>
<div
class="el-dropdown-link"
style="display: flex"
:style="{ color: textColor }"
>
<div class="el-dropdown-link" style="display:flex" :style="{color:textColor}">
<div class="person-action-index">
<div v-if="userInfo.avatar !== ''" class="user-avatar">
<img
:src="userInfo.avatar"
style="width: 35px; height: 35px"
/>
<div v-if="userInfo.avatar !== '' " class="user-avatar">
<img :src="userInfo.avatar" style="width: 35px;height: 35px;"/>
</div>
<div v-else class="uavatar">
<div v-if="sex === 1">
<img
src="../../public/images/Avatarman.png"
alt=""
style="width: 30px; height: 30px"
/>
</div>
<div v-else>
<img
src="../../public/images/Avatarwoman.png"
alt=""
style="width: 30px; height: 30px"
/>
<div v-if="sex === 1 "><img src="../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;"></div>
<div v-else><img src="../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;"></div>
</div>
</div>
</div>
<div style="font-weight: 400; font-size: 16px; margin-top: 8px">
{{ userInfo.name }}
</div>
<div style="font-weight: 400;font-size: 16px; margin-top: 8px;">{{userInfo.name}}</div>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="setCurIdentity(1)"
><a
:href="`${webBaseUrl}${
isTiao ? '/uc/study/task' : '/uc/study/courses'
}`"
>个人中心</a
></el-dropdown-item
>
<el-dropdown-item
><router-link :to="'/home/' + userInfo.aid"
>个人主页</router-link
></el-dropdown-item
>
<el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
<el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="person-action-item">
<div
class="person-action-index pointer"
:style="{ color: textColor }"
@click="logout()"
>
<svg-icon
style="margin-right: 4px; font-size: 16px"
icon-class="white-out"
></svg-icon
>登出
<div class="person-action-index pointer" :style="{color:textColor}" @click="logout()">
<svg-icon style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出
</div>
</div>
</div>
@@ -294,110 +142,95 @@
</div>
</template>
<script>
import { mapGetters, mapActions } from "vuex";
import apiMessage from "@/api/system/message.js";
import popup from "@/components/AlertPopup.vue";
import yearMedal from "@/components/Popup/China2023.vue";
import apiBoeCourse from "@/api/boe/course.js";
import { userAvatarText } from "@/utils/tools.js";
import { mapGetters, mapActions } from 'vuex';
import apiMessage from '@/api/system/message.js';
import popup from '@/components/AlertPopup.vue';
import yearMedal from '@/components/Popup/China2023.vue';
import apiBoeCourse from '@/api/boe/course.js';
import {userAvatarText} from "@/utils/tools.js";
import apiCase from "@/api/modules/cases.js";
export default {
props: {
current: {
type: String,
default: "",
default: '',
},
hideSearch: {
hideSearch:{
type: Boolean,
default: false,
},
textColor: {
textColor:{
type: String,
default: "",
default: '',
},
goSearch: {
goSearch:{
type: Number,
default: 0,
},
keywords: {
type: String,
default: "",
keywords:{
type:String,
default:''
},
},
components: { popup, yearMedal },
components:{popup,yearMedal},
computed: {
...mapGetters([
"userInfo",
"curIdentity",
"userMsg",
"identity",
"studyTaskCount",
]),
...mapGetters(['userInfo','curIdentity', 'userMsg','identity','studyTaskCount']),
avatarText() {
avatarText(){
return userAvatarText(this.userInfo.name);
},
activeNav() {
activeNav(){
return {
"top-nav-active-blue": this.textColor == "#000000",
"top-nav-active-white":
this.textColor == "#fff" || this.textColor == "#ffffff",
};
},
},
watch: {
keywords(newval) {
console.log(newval, 9999);
if (this.findType == "1") {
this.keyword = newval;
'top-nav-active-blue': this.textColor=='#000000',
'top-nav-active-white': this.textColor=='#fff' || this.textColor=='#ffffff',
}
}
},
"$route.query.keyword": {
handler(newval) {
if (newval && this.current == "case") {
this.keyword = newval;
watch:{
keywords(newval){
console.log(newval,9999);
if(this.findType == '1'){
this.keyword = newval
}
}
},
immediate: true,
},
},
data() {
return {
popupConfig: {},
ctx: process.env.VUE_APP_PUBLIC_PATH,
managerPath: process.env.VUE_APP_MANAGER_PATH,
popupConfig:{},
ctx:process.env.VUE_APP_PUBLIC_PATH,
managerPath:process.env.VUE_APP_MANAGER_PATH,
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
findType: "1",
keyword: "",
findType: '1',
keyword: '',
isTiao: false,
sex: "",
sex:'',
};
},
mounted() {
this.sex = this.userInfo.sex;
this.$store.dispatch("refrashMsg");
this.$store.dispatch('refrashMsg');
this.loadBoeData();
// console.log('this.userInfo::',this.userInfo)
//this.loadPopupConfig();
},
methods: {
handleChangeCourse() {
const paths = ["/course", "/qualityCourse"];
const paths = ["/course","/qualityCourse"]
// 如果是 课程 和 精品课程, 那么就不再重定向
const needReload = paths.findIndex((e) => e === this.$route.path) === -1;
if (needReload) this.$router.push({ path: paths[0] });
const needReload = paths.findIndex(e=> e === this.$route.path) === -1
if (needReload) this.$router.push({path: paths[0]})
},
setCurIdentity(iden) {
this.$store.dispatch("SetCurIdentity", iden);
setCurIdentity(iden){
this.$store.dispatch('SetCurIdentity',iden);
},
tomy() {
console.log("lll");
tomy(){
console.log('lll')
},
loadBoeData() {
if (this.studyTaskCount > 0) {
if(this.studyTaskCount>0){
this.isTiao = true;
} else {
}else{
this.isTiao = false;
}
// let params = {
@@ -415,18 +248,18 @@ export default {
// }
// });
},
handleContributor(val) {
handleContributor(val){
let urlPre = window.location.protocol + "//" + window.location.host;
let obj = {
one: urlPre + "/web/contributornew/index",
two: urlPre + "/web/contributor/index",
three: urlPre + "/web/contributor_2024/index",
three: urlPre + "/web/contributor_2024/index"
};
window.open(obj[val]);
},
handleCommand(val) {
if (val === "four") {
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
// this.$emit('showClass',true)
} else {
let urlPre = window.location.protocol + "//" + window.location.host;
@@ -439,104 +272,83 @@ export default {
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
five: urlPre + "/boe/new-employee/index.html",
six: urlPre + "/web/contributor/index",
seven: this.webBaseUrl + "/grateful/index",
seven: this.webBaseUrl + '/grateful/index'
};
window.open(obj[val]);
}
},
handleUcCommand(val) {
if (val == "uc") {
window.location.href = `${this.webBaseUrl}${
this.isTiao ? "/uc/study/task" : "/uc/study/courses"
}`;
} else if (val == "logout") {
if (val == 'uc') {
window.location.href = `${this.webBaseUrl}${this.isTiao ? '/uc/study/task' : '/uc/study/courses'}`;
} else if (val == 'logout') {
this.logout();
}
},
searchJump() {
this.$emit("type1", "");
if (this.current == "index") {
if (this.findType == "1") {
if (this.keyword == "") {
return;
}
this.$emit('type1', '')
if(this.current == 'index') {
if (this.findType == '1') {
if(this.keyword==''){return;}
// 课程
location.href = `${this.webBaseUrl}/course?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/course?keyword=${this.keyword}`;
//window.open(`${this.webBaseUrl}/course?keyword=${this.keyword}`);
} else if (this.findType == "2") {
if (this.keyword == "") {
return;
}
} else if (this.findType == '2') {
if(this.keyword==''){return;}
// 案例
location.href = `${this.webBaseUrl}/case?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
//window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
} else if (this.findType == "3") {
if (this.keyword == "") {
return;
}
} else if (this.findType == '3') {
if(this.keyword==''){return;}
//文章
location.href = `${this.webBaseUrl}/article?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/article?keyword=${this.keyword}`;
//window.open(`${this.webBaseUrl}/article?keyword=${this.keyword}`);
} else if (this.findType == "4") {
if (this.keyword == "") {
return;
}
} else if (this.findType == '4') {
if(this.keyword==''){return;}
// 问答
location.href = `${this.webBaseUrl}/qa?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/qa?keyword=${this.keyword}`;
//window.open(`${this.webBaseUrl}/qa?keyword=${this.keyword}`);
} else if (this.findType == "5") {
} else if (this.findType == '5') {
// 专区,专区要单独的写,因为不是一个系统呀
window.open(`${this.webBaseUrl}/zone?keyword=${this.keyword}`);
}
} else {
this.$emit("emitInput", this.keyword);
if (this.goSearch == 1) {
if (this.keyword == "") {
return;
}
} else {
this.$emit('emitInput',this.keyword)
if(this.goSearch == 1) {
if(this.keyword==''){return;}
// 课程
location.href = `${this.webBaseUrl}/course?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/course?keyword=${this.keyword}`;
} else if (this.goSearch == 2) {
if (this.keyword == "") {
return;
}
if(this.keyword==''){return;}
// 案例
// location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
this.$router.push(`/case?keyword=${this.keyword}`);
this.$router.push(`/case?keyword=${this.keyword}`)
//window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
} else if (this.goSearch == 3) {
if (this.keyword == "") {
return;
}
if(this.keyword==''){return;}
//文章
location.href = `${this.webBaseUrl}/article?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/article?keyword=${this.keyword}`;
//window.open(`${this.webBaseUrl}/article?keyword=${this.keyword}`);
} else if (this.goSearch == 4) {
if (this.keyword == "") {
return;
}
if(this.keyword==''){return;}
// 问答
location.href = `${this.webBaseUrl}/qa?keyword=${this.keyword}`;
location.href=`${this.webBaseUrl}/qa?keyword=${this.keyword}`;
//window.open(`${this.webBaseUrl}/qa?keyword=${this.keyword}`);
} else if (this.goSearch == 5) {
// 专区,专区要单独的写,因为不是一个系统呀
window.open(`${this.webBaseUrl}/zone?keyword=${this.keyword}`);
}
}
}
},
logout() {
this.$confirm("您确定要退出系统吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$store.dispatch("LogOut").then(() => {
this.$confirm('您确定要退出系统吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
//location.href = this.webBaseUrl + '/login';
sessionStorage.setItem(
"dialog_session_show" + this.userInfo.aid,
null
); // 清除兴趣采集的"关闭"缓存
sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
location.href = process.env.VUE_APP_LOGIN_URL;
});
})
@@ -544,52 +356,49 @@ export default {
},
//获取未读消息数量
getMsgNum() {
apiMessage.isRead().then((res) => {
apiMessage.isRead().then(res => {
if (res.status == 200) {
this.msgNum = res.result;
}
});
},
},
}
}
};
</script>
<style scoped rel="stylesheet/scss" lang="scss">
::v-deep .el-dropdown-menu__item:not(.is-disabled):hover {
::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
background-color: #fff !important;
color: #0059ff !important;
color: #0059FF !important;
}
::v-deep.el-dropdown-menu {
text-align: center;
text-align: center;
border: none !important;
}
//定义消息的图标的样式按ui未完成
.msg-icon {
font-size: 16px;
background-color: #fff;
border-radius: 50%;
//定义消息的图标的样式按ui未完成
.msg-icon{
font-size:16px;
background-color:#fff;
border-radius:50%;
}
.top-nav-active-blue {
color: #387df7;
a {
color: #387df7;
}
div {
.top-nav-active-blue{
color: #387DF7;
a{color:#387DF7;}
div{
width: 75%;
height: 4px;
top: 75%;
left: 13%;
background: #387df7;
background: #387DF7;
border-radius: 5px;
position: absolute;
}
}
.top-nav-active-white {
.top-nav-active-white{
color: #fff;
a {
color: #fff;
}
div {
a{color:#fff;}
div{
width: 75%;
height: 4px;
top: 75%;
@@ -600,15 +409,15 @@ export default {
}
}
.sear-but {
.sear-but{
position: absolute;
bottom: 10%;
right: 5px;
}
::v-deep .el-input__inner {
::v-deep .el-input__inner{
border-radius: 6px;
border-right: none;
}
}
::v-deep .el-badge__content.is-fixed {
right: 10px;
}
@@ -617,41 +426,42 @@ export default {
// margin: 0 87px;
height: 72px;
display: flex;
background: rgba(255, 255, 255, 0.1);
border: 1px solid rgba(61, 61, 61, 0.15);
background: rgba(255,255,255,0.1);
border: 1px solid rgba(61,61,61,0.15);
backdrop-filter: blur(10px);
}
.portal-top {
.portal-top{
width: 100%;
margin: 0px 40px;
display: flex;
justify-content: space-between;
.portal-top-left {
justify-content:space-between;
.portal-top-left{
display: flex;
justify-content: flex-start;
align-items: center;
.portal-top-logo {
.portal-top-logo{
}
.portal-top-nav {
.portal-top-nav{
display: flex;
justify-content: space-around;
margin-left: 20px;
}
}
.portal-top-right {
flex: 1;
.portal-top-right{
flex:1;
display: flex;
justify-content: flex-end;
align-items: center;
}
//width: 1050px;
.person-action {
.person-action{
display: flex;
justify-content: flex-end;
align-items: center;
margin-left: 10px;
.person-action-index {
.person-action-index{
//margin-left: 40px;
font-size: 16px;
font-weight: 400;
@@ -666,20 +476,20 @@ export default {
// // right: 48px;
// // }
// }
::v-deep.el-avatar {
::v-deep.el-avatar{
margin-right: 8px;
img {
img{
width: 100% !important;
}
}
.el-button {
.el-button{
margin-left: 15px;
margin-top: 1px;
// font-size: 14px;
}
}
}
.person-action-item {
.person-action-item{
margin-left: 30px;
}
.top-nav {
@@ -689,42 +499,42 @@ export default {
color: #000000;
line-height: 72px;
padding: 0px 10px;
white-space: nowrap;
white-space:nowrap;
position: relative;
}
//此处理应该移到单独的一个样式中比较好
@media screen and (max-width: 1366px) {
@media screen and (max-width: 1366px){
.top-nav {
padding: 0px 10px;
}
.person-action-item {
.person-action-item{
margin-left: 20px;
}
}
@media screen and (max-width: 1680px) and (min-width: 1367px) {
@media screen and (max-width: 1680px) and (min-width:1367px){
.top-nav {
padding: 0px 15px;
}
.person-action-item {
.person-action-item{
margin-left: 30px;
}
}
@media screen and (max-width: 1920px) and (min-width: 1681px) {
@media screen and (max-width: 1920px) and (min-width: 1681px){
.top-nav {
padding: 0px 30px;
}
.person-action-item {
.person-action-item{
margin-left: 40px;
}
}
@media screen and (min-width: 1921px) {
@media screen and (min-width: 1921px){
.top-nav {
padding: 0px 40px;
}
.person-action-item {
.person-action-item{
margin-left: 45px;
}
}
@@ -732,6 +542,7 @@ export default {
::v-deep .el-badge {
.el-badge__content {
top: 0px;
}
}
@@ -742,7 +553,7 @@ export default {
// border: 1px solid #333333;
border-radius: 0 20px 20px 0;
border-left: none;
background: rgba(255, 255, 255, 0.12);
background: rgba(255,255,255,0.12);
}
.message-count a {
@@ -752,6 +563,7 @@ export default {
}
::v-deep .el-badge {
margin-top: 0 !important;
}
::v-deep .el-link.el-link--primary:hover {
color: #588afc;
@@ -760,10 +572,10 @@ export default {
cursor: pointer;
color: #000000;
}
.uavatar {
div {
.uavatar{
div{
border-radius: 50%;
img {
img{
border-radius: 50%;
width: 30px;
height: 30px;
@@ -775,11 +587,11 @@ export default {
font-size: 14px;
margin-right: 8px;
border-radius: 50%;
}
.user-avatar {
}
.user-avatar{
display: inline-block;
border-radius: 50%;
img {
img{
border-radius: 50%;
width: 30px;
height: 30px;
@@ -791,5 +603,5 @@ export default {
font-size: 14px;
margin-right: 8px;
border-radius: 50%;
}
}
</style>

View File

@@ -11,16 +11,16 @@ import xpage from '@/utils/xpage'
NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/logout', '/loading', '/pc/loading', '/500', '/auth-redirect', '/forget', '/reset/password']
const whiteList = ['/login','/logout','/loading','/pc/loading','/500','/auth-redirect','/forget','/reset/password']
router.beforeEach((to, from, next) => {
watermark.set("");
//动态计算文件的路径
let configPath = process.env.VUE_APP_FILE_RELATIVE_PATH;
if (configPath.startsWith('http')) {
xpage.constants.fileBaseUrl = configPath;
} else {
xpage.constants.fileBaseUrl = window.location.protocol + '//' + window.location.host + configPath;
let configPath=process.env.VUE_APP_FILE_RELATIVE_PATH;
if(configPath.startsWith('http')){
xpage.constants.fileBaseUrl=configPath;
}else{
xpage.constants.fileBaseUrl=window.location.protocol+'//'+window.location.host+configPath;
}
NProgress.start();
@@ -28,21 +28,21 @@ router.beforeEach((to, from, next) => {
if (whiteList.indexOf(to.path) !== -1) {
// 在免登录白名单,直接进入
next()
} else {
if (getToken()) {
if (to.path === '/login') {
}else{
if(getToken()){
if(to.path === '/login'){
// 如果是外部用户,把配置的路由跳转到个人中心
if (store.getters.userInfo.role === 2) {
next({ path: process.env.VUE_APP_PUBLIC_PATH + '/uc/study/courses' })
} else {
next({ path: process.env.VUE_APP_PUBLIC_PATH + '/index' })
if(store.getters.userInfo.role === 2){
next({ path: process.env.VUE_APP_PUBLIC_PATH+'/uc/study/courses' })
}else{
next({ path: process.env.VUE_APP_PUBLIC_PATH+'/index' })
}
NProgress.done();
} else {
//console.log('store.getters.userInfo:',store.getters.userInfo.role)
// 如果是外部用户,把配置的路由跳转到个人中心
if (store.getters.userInfo.role === 2) {
if (to.path === '/index' || to.path === '/course' || to.path === '/case' || to.path === '/article') location.href = '/pc/uc/study/task'
if(store.getters.userInfo.role === 2){
if(to.path === '/index' || to.path === '/course' || to.path === '/case' || to.path === '/article' ) location.href = '/pc/uc/study/task'
}
//后续这里需要增加一定的控制
if (!store.getters.init) {
@@ -56,17 +56,17 @@ router.beforeEach((to, from, next) => {
store.dispatch('resOwner/loadResOwners');
store.dispatch('sysType/loadSysTypes');
store.commit('app/SET_INITDATA', true);
store.commit('app/SET_INITDATA',true);
//routers数据先使用固定的以后在初始化接口中返回
let myRouters = routers();
store.dispatch('GenerateRoutes', { routers: myRouters }).then(accessRoutes => {
let myRouters=routers();
store.dispatch('GenerateRoutes',{routers:myRouters}).then(accessRoutes=>{
router.addRoutes(accessRoutes) // 动态添加可访问路由表
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
});
}).catch(err => {
console.log(err);
store.commit('app/SET_INITDATA', false);
store.commit('app/SET_INITDATA',false);
//如果初始化错误,就不再执行了,不然会一直循环下去
next({ path: '/500' })
//NProgress.done();
@@ -78,7 +78,7 @@ router.beforeEach((to, from, next) => {
}
//next();
} else {
}else{
//next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
//设置之前的路径
@@ -86,12 +86,7 @@ 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()
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);
location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
NProgress.done()
}

View File

@@ -19,13 +19,13 @@ import errorCode from '@/utils/errorCode'
//const ReLoginUrl="/login";
const ReLoginUrl = process.env.VUE_APP_LOGIN_URL;
const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
const TokenName = 'XBOE-Access-Token';
const TokenName='XBOE-Access-Token';
/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
//只是用于发送json对象数据时使用post,put,patch
const jsonRequest = axios.create({
headers: { 'Content-Type': 'application/json;charset=utf-8' },
const jsonRequest=axios.create({
headers:{'Content-Type':'application/json;charset=utf-8'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
//超时
@@ -48,56 +48,36 @@ jsonRequest.interceptors.request.use(config => {
jsonRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code == 6001) { //针对于老系统的处理
}else{
if(code == 6001){ //针对于老系统的处理
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 401) {
}else if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 402) {
}else if(code === 402){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
//return res.data;
} else if (code === 302) {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
} else {
}else if(code===302){
location.href = ReLoginUrl;
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err:' + res.data.error);
//return Promise.reject(new Error(res.data.message))
return res.data;
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -121,8 +101,8 @@ jsonRequest.interceptors.response.use(res => {
)
//用于普通的发送请求
const formRequest = axios.create({
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
const formRequest=axios.create({
headers:{'Content-Type':'application/x-www-form-urlencoded'},
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
//超时
@@ -142,55 +122,35 @@ formRequest.interceptors.request.use(config => {
});
formRequest.interceptors.response.use(res => {
const code = res.data.status || 200;
if (code === 200) {
if(code===200){
return res.data
} else {
if (code == 6001) { //针对于老系统的处理,因为老系统是字符串,所以这里不使用三等于号
}else{
if(code == 6001){ //针对于老系统的处理,因为老系统是字符串,所以这里不使用三等于号
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 401) {
}else if(code === 401){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 402) {
}else if(code === 402){
store.dispatch('LogOut').then(() => {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
location.href = ReLoginUrl;
})
} else if (code === 403) {
var msg = '当前操作没有权限';
Message({ message: msg, type: 'error' });
}else if(code===403){
var msg='当前操作没有权限';
Message({message: msg, type: 'error'});
return Promise.reject(new Error(msg))
} else if (code === 302) {
if (top !== window) { // 判断当前是否在iframe内
top.location.href = ReLoginUrl;
} else {
window.location.href = ReLoginUrl;
}
// location.href = ReLoginUrl;
} else {
}else if(code===302){
location.href = ReLoginUrl;
}else{
//Message({message: res.data.message, type: 'error'});
//console.log('err' + res.data.error);
//return Promise.reject(new Error(res.data.message))
return res.data;//返回给用户做业务处理
}
}
},
},
error => {
console.log('err' + error)
let { message } = error;
@@ -214,48 +174,48 @@ formRequest.interceptors.response.use(res => {
)
//request请求
const request = function (cfg) {
if (cfg.data) {
cfg.data = qs.stringify(cfg.data);
const request=function(cfg){
if(cfg.data){
cfg.data=qs.stringify(cfg.data);
}
};
//requestJson请求
const requestJson = jsonRequest.request;
const requestJson=jsonRequest.request;
//get请求
const get = formRequest.request;
const get=formRequest.request;
//post请求
const post = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const post=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.post(url, data, config);
return formRequest.post(url,data,config);
}
//post请求
const postForm = function (url, data, config) {
return formRequest.post(url, data, config);
const postForm=function(url,data,config){
return formRequest.post(url,data,config);
}
//postJson请求
const postJson = jsonRequest.post;
const postJson=jsonRequest.post;
//put请求
const put = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const put=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.put(url, data, config);
return formRequest.put(url,data,config);
}
//putJson请求
const putJson = jsonRequest.put;
const putJson=jsonRequest.put;
//patch请求
const patch = function (url, data, config) {
if (data) {
data = qs.stringify(data);
const patch=function(url,data,config){
if(data){
data=qs.stringify(data);
}
return formRequest.patch(url, data, config);
return formRequest.patch(url,data,config);
}
//patchJson请求
const patchJson = jsonRequest.patch;
const patchJson=jsonRequest.patch;
//delete请求
const del = formRequest.delete;
const del=formRequest.delete;
export default {

View File

@@ -163,12 +163,11 @@
<!-- 精品课模块 -->
<div class="xcontent2-main">
<div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
<!-- <span class="jin-text">精品课</span> -->
<div class="jin-zhe"></div>
<!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
<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>
@@ -2827,15 +2826,6 @@ 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;
@@ -3146,13 +3136,4 @@ 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,61 +5,56 @@
</template>
<script>
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;
let token = getToken();
let $this = this;
if (!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;
let token=getToken();
let $this=this;
if(!token){
//console.log(token,'未获取token');
setTimeout(function () {
$this.curToken = getToken();
if (!$this.curToken) {
setTimeout(function(){
$this.curToken=getToken();
if(!$this.curToken){
//console.log(token,'第二次未获取token');
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 {
location.href = process.env.VUE_APP_LOGIN_URL;
}else{
$this.boeLogin();
}
}, 500);
} else {
this.curToken = token;
},500);
}else{
this.curToken=token;
this.boeLogin();
}
},
data() {
data(){
return {
curToken: "",
toUrl: "",
};
curToken:'',
toUrl:''
}
},
methods: {
boeLogin() {
apiLogin.boeLogin(this.curToken).then((rs) => {
if (rs.status == 200) {
methods:{
boeLogin(){
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" });
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" })
} else {
this.$message.error("登录失败:" + rs.message);
}else{
this.$message.error("登录失败:"+rs.message);
}
})
}
}
}
});
},
},
};
</script>
<style>

View File

@@ -123,6 +123,16 @@
</el-table-column>
<el-table-column label="创建人" prop="sysCreateBy"></el-table-column>
<el-table-column label="创建时间" prop="sysCreateTime" width="230px" show-overflow-tooltip></el-table-column>
<el-table-column label="审核人" prop="auditUser" width="130px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.auditUser || '-' }}
</template>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="230px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.auditTime || '-' }}
</template>
</el-table-column>
<el-table-column label="是否停用" width="130px">
<template slot-scope="scope">
{{ scope.row.enabled == true ? '启用' : '停用' }}

View File

@@ -2,15 +2,18 @@
<div>
<!-- 最大化状态的弹窗 -->
<el-dialog
v-if="dialogVisible && windowState === 'maximized'"
v-if="dialogVisible"
:visible="true"
width="800px"
:close-on-click-modal="false"
:show-close="true"
@close="onClose"
class="case-expert-dialog"
:modal="false"
:append-to-body="true"
:fullscreen="false"
top="0"
top="10vh"
v-show="windowState === 'maximized'"
v-resizeable
v-draggable
>
@@ -33,7 +36,6 @@
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>
@@ -134,18 +136,10 @@ export default {
const headerEl = dialogEl.querySelector('.dialog-title');
if (!headerEl) return;
// 检查是否有保存的位置状态
const savedPosition = sessionStorage.getItem('aiCallDialogPosition');
if (savedPosition) {
const { left, top } = JSON.parse(savedPosition);
dialogEl.style.left = left + 'px';
dialogEl.style.top = top + 'px';
} else {
// 设置初始样式
dialogEl.style.position = 'fixed';
dialogEl.style.top = '100px';
dialogEl.style.left = (window.innerWidth - dialogEl.offsetWidth) / 2 + 'px';
}
dialogEl.style.margin = '0';
let isDragging = false;
@@ -182,18 +176,15 @@ export default {
dialogEl.style.left = (startLeft + deltaX) + 'px';
dialogEl.style.top = (startTop + deltaY) + 'px';
};
const stopDrag = () => {
isDragging = false;
// 保存当前位置到 sessionStorage
const currentPosition = {
left: parseInt(dialogEl.style.left),
top: parseInt(dialogEl.style.top)
};
// sessionStorage.setItem('aiCallDialogPosition', JSON.stringify(currentPosition));
// 移除全局事件监听
document.removeEventListener('mousemove', handleMouseMove);
document.removeEventListener('mouseup', stopDrag);
@@ -212,20 +203,10 @@ export default {
const dialogEl = el.querySelector('.el-dialog');
if (!dialogEl) return;
// 检查是否有保存的尺寸状态
const savedSize = sessionStorage.getItem('aiCallDialogSize');
if (savedSize) {
const { width, height, left, top } = JSON.parse(savedSize);
dialogEl.style.width = width + 'px';
dialogEl.style.height = height + 'px';
dialogEl.style.left = left + 'px';
dialogEl.style.top = top + 'px';
} else {
// 设置初始样式
dialogEl.style.position = 'fixed';
dialogEl.style.top = '100px';
dialogEl.style.left = (window.innerWidth - dialogEl.offsetWidth) / 2 + 'px';
}
// 创建拖拽手柄
const createHandle = (direction) => {
@@ -354,93 +335,65 @@ export default {
const deltaX = event.clientX - startX;
const deltaY = event.clientY - startY;
let newWidth, newHeight, newLeft, newTop;
switch (resizeDirection) {
case 'right':
newWidth = Math.max(400, startWidth + deltaX);
dialogEl.style.width = newWidth + 'px';
dialogEl.style.width = Math.max(400, startWidth + deltaX) + 'px';
break;
case 'left':
newWidth = Math.max(400, startWidth - deltaX);
newLeft = startLeft + startWidth - newWidth;
const newWidth = Math.max(400, startWidth - deltaX);
dialogEl.style.width = newWidth + 'px';
dialogEl.style.left = newLeft + 'px';
dialogEl.style.left = (startLeft + startWidth - newWidth) + 'px';
break;
case 'bottom':
newHeight = Math.max(600, startHeight + deltaY);
dialogEl.style.height = newHeight + 'px';
dialogEl.style.height = Math.max(600, startHeight + deltaY) + 'px';
break;
case 'top':
// 当窗口高度达到最小值时,不再调整高度和位置
if (startHeight - deltaY >= 600) {
newHeight = startHeight - deltaY;
newTop = startTop + deltaY;
dialogEl.style.height = newHeight + 'px';
dialogEl.style.top = newTop + 'px';
dialogEl.style.height = (startHeight - deltaY) + 'px';
dialogEl.style.top = (startTop + deltaY) + 'px';
}
break;
case 'bottom-right':
newWidth = Math.max(400, startWidth + deltaX);
newHeight = Math.max(600, startHeight + deltaY);
dialogEl.style.width = newWidth + 'px';
dialogEl.style.height = newHeight + 'px';
dialogEl.style.width = Math.max(400, startWidth + deltaX) + 'px';
dialogEl.style.height = Math.max(600, startHeight + deltaY) + 'px';
break;
case 'bottom-left':
newWidth = Math.max(400, startWidth - deltaX);
newHeight = Math.max(600, startHeight + deltaY);
newLeft = startLeft + startWidth - newWidth;
dialogEl.style.width = newWidth + 'px';
dialogEl.style.left = newLeft + 'px';
dialogEl.style.height = newHeight + 'px';
const newWidthBL = Math.max(400, startWidth - deltaX);
dialogEl.style.width = newWidthBL + 'px';
dialogEl.style.left = (startLeft + startWidth - newWidthBL) + 'px';
dialogEl.style.height = Math.max(600, startHeight + deltaY) + 'px';
break;
case 'top-right':
// 当窗口高度达到最小值时,不再调整高度和位置
if (startHeight - deltaY >= 600) {
newHeight = startHeight - deltaY;
newTop = startTop + deltaY;
newWidth = Math.max(400, startWidth + deltaX);
dialogEl.style.height = newHeight + 'px';
dialogEl.style.top = newTop + 'px';
dialogEl.style.width = newWidth + 'px';
dialogEl.style.height = (startHeight - deltaY) + 'px';
dialogEl.style.top = (startTop + deltaY) + 'px';
}
dialogEl.style.width = Math.max(400, startWidth + deltaX) + 'px';
break;
case 'top-left':
// 当窗口高度达到最小值时,不再调整高度和位置
if (startHeight - deltaY >= 600) {
newHeight = startHeight - deltaY;
newTop = startTop + deltaY;
newWidth = Math.max(400, startWidth - deltaX);
newLeft = startLeft + startWidth - newWidth;
dialogEl.style.height = newHeight + 'px';
dialogEl.style.top = newTop + 'px';
dialogEl.style.width = newWidth + 'px';
dialogEl.style.left = newLeft + 'px';
dialogEl.style.height = (startHeight - deltaY) + 'px';
dialogEl.style.top = (startTop + deltaY) + 'px';
}
const newWidthTL = Math.max(400, startWidth - deltaX);
dialogEl.style.width = newWidthTL + 'px';
dialogEl.style.left = (startLeft + startWidth - newWidthTL) + 'px';
break;
}
let doc = document.querySelector('.welcome-message')
let sendBox = document.querySelector('.input-area-wrapper');
// sendBox 的高度
if (doc && sendBox) {
doc.style.height = `calc(${dialogEl.style.height} - ${sendBox.offsetHeight}px - 120px)`;
}
};
const stopResize = () => {
isResizing = false;
resizeDirection = '';
// 保存当前尺寸和位置到 sessionStorage
const currentSize = {
width: parseInt(dialogEl.style.width),
height: parseInt(dialogEl.style.height),
left: parseInt(dialogEl.style.left),
top: parseInt(dialogEl.style.top)
};
sessionStorage.setItem('aiCallDialogSize', JSON.stringify(currentSize));
// 移除全局事件监听
document.removeEventListener('mousemove', handleMouseMove);
document.removeEventListener('mouseup', stopResize);
@@ -483,72 +436,26 @@ export default {
}
],
suggestions:[],
isAutoScroll: true, // 是否自动滚动
// 添加一个标志位,用于标识组件是否已经初始化完成
isComponentReady: false
isAutoScroll: true // 是否自动滚动
}
},
mounted() {
// 组件挂载完成后,标记为已准备就绪
this.$nextTick(() => {
this.isComponentReady = true;
});
},
watch: {
dialogVisible: {
handler(newVal) {
console.log('dialogVisible发生变化');
console.log(newVal);
console.log(this.windowState);
if (newVal) {
dialogVisible(newVal) {
if(newVal){
this.$nextTick(() => {
// 获取对话框元素
const dialogEl = document.querySelector('.case-expert-dialog .el-dialog');
if (dialogEl) {
// 检查是否有保存的尺寸状态
const savedSize = sessionStorage.getItem('aiCallDialogSize');
if (savedSize) {
const { width, height, left, top } = JSON.parse(savedSize);
dialogEl.style.width = width + 'px';
dialogEl.style.height = height + 'px';
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')
let sendBox = document.querySelector('.input-area-wrapper');
// 只有在没有保存的尺寸状态时才使用默认值
if (doc && sendBox) {
const savedSize = sessionStorage.getItem('aiCallDialogSize');
if (!savedSize) {
doc.style.height = `calc(600px - ${sendBox.offsetHeight}px - 120px)`;
} else {
const { height } = JSON.parse(savedSize);
doc.style.height = `calc(${height}px - ${sendBox.offsetHeight}px - 120px)`;
}
}
});
}
},
immediate: true
// 移除之前的逻辑,因为现在通过事件机制处理状态恢复
},
messageList: {
handler() {
// 只有在组件准备就绪后才执行滚动操作
if (this.isComponentReady) {
this.$nextTick(() => {
this.scrollToBottom();
});
}
},
deep: true
}
@@ -566,9 +473,6 @@ closeMinimizedWindow() {
},
onClose() {
console.log('关闭弹窗')
// 清除保存的状态
sessionStorage.removeItem('aiCallDialogSize');
// sessionStorage.removeItem('aiCallDialogPosition');
this.$emit('close')
// 可以在这里执行其他逻辑
},
@@ -597,7 +501,6 @@ closeMinimizedWindow() {
// 处理加载状态
handleLoading(status) {
console.log('handleLoading---'+status);
this.isLoading = status;
},
@@ -619,9 +522,6 @@ closeMinimizedWindow() {
},500)
},
startNewConversation() {
// 重置对话时,先标记组件为未准备就绪状态
this.isComponentReady = false;
this.messageList = [
{
isBot: true,
@@ -633,11 +533,6 @@ closeMinimizedWindow() {
];
this.AIContent = '';
this.isLoading = false;
// 在下一个 tick 中重新标记为准备就绪
this.$nextTick(() => {
this.isComponentReady = true;
});
},
// 处理滚动事件
@@ -658,31 +553,6 @@ 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则通过事件通知父组件显示对话框
@@ -697,9 +567,6 @@ 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 ;
@@ -708,8 +575,6 @@ closeMinimizedWindow() {
overflow: hidden;
display: flex;
flex-direction: column;
pointer-events: auto;
z-index: 2000;
//background-color: rgba(255, 255, 255, 0.8);
}
@@ -776,7 +641,7 @@ closeMinimizedWindow() {
flex-direction: column;
align-items: flex-start;
margin-bottom: 10px;
height: 400px;
//height: 200px;
//flex:1;
overflow-y: auto;

File diff suppressed because it is too large Load Diff

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

View File

@@ -30,13 +30,8 @@
<!-- <div class="course-title-right"> -->
<!-- <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar> -->
<!-- </div> -->
<!-- <div class="label-div">
<el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
</div>-->
<div class="label-div">
<div v-for="(item, tagIdx) in tagArray" :key="tagIdx" class="keyword-tag">
{{ item }}
</div>
<el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
</div>
<div>
<div class="study-count">{{courseInfo.studys}}人学习</div>
@@ -425,7 +420,7 @@ export default {
.course-title{
position: relative;
height: auto;
height: 60px;
display: flex;
justify-content: space-between;
.title {
@@ -458,43 +453,18 @@ export default {
padding: 24px 24px 5px 24px;
// margin-right: 361px;
.study-count {
margin-top: 30px;
margin-top: 10px;
font-size: 16px;
color: #444444;
}
/*.label-div {
margin: 5px 0;
min-height: 20px;
.label-item {
padding: 0px 8px;
margin-top: 5px;
float: left;
line-height: 24px;
font-size: 12px;
border-radius: 2px;
margin-right: 8px;
color: #2C68FF;
height: 24px;
background: rgba(44, 104, 255, 0.06);
border: none; // 或者使用 border-color: transparent;
}
}*/
.label-div {
margin: 5px 0;
min-height: 20px;
.keyword-tag {
padding: 0px 10px;
margin-top: 7px;
float: left;
line-height: 24px;
font-size: 12px;
border-radius: 2px;
margin-right: 10px;
color: #2C68FF;
height: 24px;
background: rgba(44, 104, 255, 0.06);
.label-item {
padding: 0 7px;
margin-right: 8px;
margin-bottom: 0px;
}
}
::v-deep .el-rate__icon {

View File

@@ -62,70 +62,284 @@
</div>
</div>
<div id="fixd-box">
<!-- 好评榜 -->
<!-- <div class="portal-ranking-list ranking-bg">
<div class="ranking-title">好评榜</div>
<ul class="ranking-data">
<li class="list-info" v-for="(item, index) in scorelist" :key="index"
style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
<a style="display: inherit" @click="toCourseDetail(item)">
<span class="portal-right-text blue-one" v-if="index == 0">
<img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
</span>
<span class="portal-right-text blue-tow" v-if="index == 1">
<img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
</span>
<span class="portal-right-text blue-three" v-if="index == 2">
<img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
</span>
<span class="portal-right-text" v-if="index == 3">
<img :src="`${webBaseUrl}/images/list04.png`" alt="">
</span>
<span class="portal-right-text" v-if="index == 4">
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
</span>
<span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''"
style="font-size: 14px;">{{ item.name }}</span>
<span class="portal-title-desc" v-else style="font-size: 14px;">
<span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
</span>
<div class="list-active">
<div class="list-content">
<div class="list-img">
<course-image :course="item" :text="false" width="108px" height="60px"></course-image>
<span v-if="item.type < 21" class="course-type">录播</span>
<span v-if="item.type == 30" class="course-type">线下课</span>
<span v-if="item.type == 40" class="course-type">学习项目</span>
</div>
<div class="list-text">
<h6 class="index-one-line-ellipsis">{{ item.name }}</h6>
<span class="index-one-line-ellipsis">{{ item.publishTime }}</span>
</div>
</div>
<div class="list-bottom">
<couresinteract :type="1" :data="item"></couresinteract>
</div>
</div>
</a>
</li>
</ul>
</div> -->
<!-- 人气榜 -->
<!-- <div style="margin-top:26px" class="portal-ranking-list ranking-bg1">
<div class="ranking-title">人气榜</div>
<ul class="ranking-data">
<li class="list-info" v-for="(item, index) in ankingList" :key="index"
style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
<a style="display: inherit" @click="toCourseDetail(item)">
<span class="portal-right-text orange-one" v-if="index == 0">
<img :src="`${webBaseUrl}/images/list-01.png`" alt="">
</span>
<span class="portal-right-text orange-tow" v-if="index == 1">
<img :src="`${webBaseUrl}/images/list02.png`" alt="">
</span>
<span class="portal-right-text orange-three" v-if="index == 2">
<img :src="`${webBaseUrl}/images/list03.png`" alt="">
</span>
<span class="portal-right-text" v-if="index == 3">
<img :src="`${webBaseUrl}/images/list04.png`" alt="">
</span>
<span class="portal-right-text" v-if="index == 4">
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
</span>
<span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''"
style="font-size: 14px;">{{ item.name }}</span>
<span class="portal-title-desc" v-else style="font-size: 14px;">
<span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
</span>
<div class="list-active">
<div class="list-content">
<div class="list-img">
<course-image :course="item" :text="false" width="108px" height="60px"></course-image>
<span v-if="item.type < 21" class="course-type">录播</span>
<span v-if="item.type == 30" class="course-type">线下课</span>
<span v-if="item.type == 40" class="course-type">学习项目</span>
</div>
<div class="list-text">
<h6 class="index-one-line-ellipsis">{{ item.name }}</h6>
<span class="index-one-line-ellipsis">{{ item.publishTime }}</span>
</div>
</div>
<div class="list-bottom">
<couresinteract :type="1" :data="item"></couresinteract>
</div>
</div>
</a>
</li>
</ul>
</div> -->
<!-- 热榜 -->
<!-- <div style="margin-top:26px" class="portal-ranking-list ranking-bg2">
<div class="ranking-title">热度榜</div>
<ul class="ranking-data">
<li class="list-info" v-for="(item, index) in hotList" :key="index"
style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
<a style="display: inherit" @click="toCourseDetail(item)">
<span class="portal-right-text orange-one" v-if="index == 0">
<img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
</span>
<span class="portal-right-text orange-tow" v-if="index == 1">
<img :src="`${webBaseUrl}/images/listred02.png`" alt="">
</span>
<span class="portal-right-text orange-three" v-if="index == 2">
<img :src="`${webBaseUrl}/images/listred03.png`" alt="">
</span>
<span class="portal-right-text" v-if="index == 3">
<img :src="`${webBaseUrl}/images/list04.png`" alt="">
</span>
<span class="portal-right-text" v-if="index == 4">
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
</span>
<span class="portal-title-desc title-line-ellipsis list-lidex" v-if="item.images == ''"
style="font-size: 14px;">{{ item.courseName }}</span>
<span class="portal-title-desc " v-else style="font-size: 14px;">
<span class="portal-images-title two-line-ellipsis">{{ item.courseName }}</span>
</span>
<div class="list-active">
<div class="list-content">
<div class="list-img">
<course-image :course="item" :text="false" width="108px" height="60px"></course-image>
<span v-if="item.type < 21" class="course-type">录播</span>
<span v-if="item.type == 30" class="course-type">线下课</span>
<span v-if="item.type == 40" class="course-type">学习项目</span>
</div>
<div class="list-text">
<h6 class="index-one-line-ellipsis">{{ item.courseName }}</h6>
<span class="index-one-line-ellipsis">{{ item.publishTime }}</span>
</div>
</div>
<div class="list-bottom">
<couresinteract :type="1" :data="item"></couresinteract>
</div>
</div>
</a>
</li>
</ul>
</div> -->
</div>
</div>
<!-- 右侧 -->
<div class="xcontent2-main content-div">
<!-- 内容导航 -->
<div class="topNav" v-if="!newData">
<div class="search-div nav" style="flex: 1;height: auto;background: #fff;">
<div class="nav-primary" style="gap: 15px;display: flex;margin-top: 20px;">
<div @click="handleTypeAllClick(1)" class="option-item" style="position: relative;" :class="{ 'option-active': ctypeTagAll }">
<a>全部</a>
<!-- 之前的 -->
<!-- <div class="search-div" style="margin-right:36px">
<div class="searchbar" style="padding-right: 40px;" v-if="stagList.length > 0">
<span @click="handleClearTags" style="float: right;margin-top: 6px;margin-right: -20px;color: #858585;cursor: pointer;" title="清除查询条件"><i class="el-icon-close"></i> 清除</span>
<div style="line-height: 30px;">
<span class="item-title"> 搜索条件</span>
<el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t'+tagIdx" @close="stagClose(tag,tagIdx)">{{ tag.name }}</el-tag>
</div>
<div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
:class="{ 'option-active': ctypeList[0].checked }">
<a>录播课</a>
</div>
<div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
:class="{ 'option-active': ctypeList[1].checked }">
<a>线下课</a>
<div class="search-item">
<div style="margin-top:10px; display: flex;">
<div style="line-height: 25px;padding-right: 10px;">
<span class="item-title" style="padding-right: 5px;">授课方式:</span>
</div>
<div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
:class="{ 'option-active': ctypeList[2].checked }">
<a>学习项目</a>
<div>
<a @click="handleTypeAllClick(1)" class="option-item" :class="{'option-active':ctypeTagAll}">全部</a>
<a @click="handleTypeClick(ctypeList[0],ctypeList)" class="option-item" :class="{'option-active':ctypeList[0].checked}">录播课</a>
<a @click="handleTypeClick(ctypeList[1],ctypeList)" class="option-item" :class="{'option-active':ctypeList[1].checked}">线下课</a>
<a class="option-border"> </a>
<a @click="handleTypeClick(ctypeList[2],ctypeList)" class="option-item" :class="{'option-active':ctypeList[2].checked}">学习项目</a>
</div>
</div>
</div>
<div class="search-item">
<div style="line-height: 25px;margin-top:10px; display: flex;">
<div class="search-item-type">
<span class="item-title" style="padding-right: 5px;">一级分类:</span>
</div>
<div>
<a @click="handleTypeAllClick(11)" class="option-item" :class="{'option-active':oneTagAll}">全部</a>
<a v-for="one in oneList" @click="handleOptionClick(one,oneList,1)" class="option-item" :class="{'option-active':one.checked}">{{one.name}}</a>
<a class="option-border"> </a>
<a class="option-item">
<span @click="uClassClick" class="Uxtext" > U选小课堂
<span @click="uClassClick" class="Uxtext" style=""> U选小课堂
<span class="uxicon">
<svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
</span>
</span>
</a>
</div>
<!-- 修改热点标签区域 -->
<div style="margin:20px 0;flex: 1;">
<!-- 修改热点标签容器支持换行 -->
</div>
</div>
<div class="search-item" v-if="twoList.length>0">
<div style="line-height: 25px;margin-top:10px; display: flex;justify-content: flex-start;">
<div class="search-item-type">
<span class="item-title" style="padding-right: 5px;">二级分类:</span>
</div>
<div style="white-space: nowrap;">
<a @click="handleTypeAllClick(12)" class="option-item" :class="{'option-active':twoTagAll}">全部</a>
</div>
<div>
<div style="display: flex">
<a v-for="two in twoList" @click="handleOptionClick(two,twoList,2)" class="option-item" :class="{'option-active':two.checked}">{{two.name}}</a>
</div>
</div>
</div>
<div class="search-item" v-if="threeList.length>0">
<div style="line-height: 25px;margin-top:10px; display: flex;justify-content: flex-start;">
<div class="search-item-type">
<span class="item-title" style="padding-right: 5px;">三级分类:</span>
</div>
<div style="white-space: nowrap;">
<a @click="handleTypeAllClick(13)" class="option-item" :class="{'option-active':threeTagAll}">全部</a>
</div>
<div>
<a v-for="three in threeList" :key="three.id" @click="handleOptionClick(three,threeList,3)" class="option-item" :class="{'option-active':three.checked}">{{three.name}}</a>
</div>
</div>
</div>
</div> -->
<!-- 内容导航 -->
<div class="topNav" v-if="!newData">
<div class="search-div nav" style="height: 100px;flex: 1;">
<div @click="handleTypeAllClick(1)" class="option-item" style="font-weight: bold;position: relative;margin-right: 20px;" :class="{ 'option-active': ctypeTagAll }">
<a>全部</a>
<span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
</div>
<div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" style="font-weight: bold"
:class="{ 'option-active': ctypeList[0].checked }">
<a>录播课</a>
<span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>
</div>
<div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item" style="font-weight: bold"
:class="{ 'option-active': ctypeList[1].checked }">
<a>线下课</a>
<span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
</div>
<div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item" style="font-weight: bold"
:class="{ 'option-active': ctypeList[2].checked }">
<a>学习项目</a>
<span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
</div>
<a class="option-item">
<span @click="uClassClick" class="Uxtext" style="font-weight: bold"> U选小课堂
<span class="uxicon">
<svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
</span>
</span>
</a>
<!-- 修改热点标签区域 -->
<div style="margin-top:10px;flex: 1;">
<!-- <div class="search-item-type" style="padding-top: 2px; float: left;">
<span class="item-title" style="padding-right: 5px;">热点标签:</span>
</div>-->
<!-- 修改热点标签容器支持换行 -->
<div class="hot-tags-wrapper">
<div
class="option-item" style=" padding-top: 2px;"
class="option-item" style="font-weight: bold; padding-top: 2px;"
:class="{ 'option-active': isAllHotTagsSelected }"
@click="handleClearHotTags"
>
<span>全部</span>
<span :class="isAllHotTagsSelected ? 'nav-bottbor' : ''"></span>
</div>
<div class="fieldbox" style="padding-left: 15px;">
<div
class="option-item" style=" padding-top: 2px;"
class="option-item" style="font-weight: bold; padding-top: 2px;"
v-for="tag in hotTagsList"
:key="tag.id"
@click="handleTagClick(tag, hotTagsList,1)"
:class="{ 'option-active': tag.checked }"
>
<span>{{tag.tagName}} </span>
<!-- <span :class="tag.checked ? 'nav-bottbor' : ''"></span>-->
</div>
</div>
<span>{{tag.tagName}}</span>
<span :class="tag.checked ? 'nav-bottbor' : ''"></span>
</div>
</div>
</div>
</div>
<!-- <div id="fixd-box" class="upload" style="margin-left: 26px;">
<!-- <div id="fixd-box" class="upload" style="margin-left: 26px;">
<div v-if="identity == 2 || identity == 3 || identity == 5">
<div class="portal-model-btn pointer" style="margin-bottom: 0px;height: 100px;line-height: 100px;"
@click="toNeedCourse">
@@ -136,11 +350,12 @@
</div>-->
</div>
<!-- 清除 -->
<div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0">
<div class="searchbar" style="display: flex;justify-content: space-between;">
<div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;margin-bottom: 20px;">
<div class="searchbar" style="background-color:#f6f7fb;display: flex;justify-content: space-between;">
<div style="line-height: 30px;">
<span class="item-title"> 搜索条件:</span>
<el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)" >
<el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)"
:style="{ color: tag.type === 0 ? '#ff0000' : '' }">
{{ tag.tagName }}
</el-tag>
</div>
@@ -182,10 +397,10 @@
v-for="(tag, tagIndex) in cinfo.tagsList"
:key="tagIndex"
size="mini"
type="info"
style="margin: 2px 2px; border-radius: 2px;"
type="info" style="margin: 2px 2px; border-radius: 2px;"
:style="{ color: isTagMatched(tag) ? '#387DF7' : '#333333' }"
>
<span v-html="highlightTagKeyword(tag)"></span>
{{ tag }}
</el-tag>
</div>
<!-- 关键字 -->
@@ -251,6 +466,10 @@
</template>
<!-- 暂无数据 -->
<div class="pagination-div">
<!-- <span class="pag-text" @click="loadMore()"
v-if="moreState == 1 && courseList.length >= course.pageSize">加载更多</span> -->
<!-- <span class="pag-text-msg" v-if="moreState == 2">数据加载中</span> -->
<!-- <span class="pag-text-msg" v-else-if="moreState == 3 && courseList.length > 0">没有更多数据了</span> -->
<span class="notcoures" v-if="moreState == 3 && courseList.length == 0">
<img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
<h5>暂无课程请优先学习其它课程吧</h5>
@@ -521,8 +740,7 @@ export default {
searchRecords: [],
hotList: [],
totalPages: 1,
localSessionKey: this.$xpage.constants.localCourseFiltersKey,
// isAllHotTagsSelected: true,
localSessionKey: this.$xpage.constants.localCourseFiltersKey
};
},
// 受众需要每次刷新
@@ -629,131 +847,6 @@ export default {
// window.removeEventListener("scroll", this.handleScroll);
},
methods: {
getSearchMode() {
const hasKeyword = this.keyword && this.keyword.trim() !== '';
// 检查是否有导航标签被选中
const hasNavigationTags = this.stagList.some(tag => {
// 课程类型(1)、热点标签(14)、分类标签(11,12,13)
return [1, 11, 12, 13, 14].includes(tag.type) && tag.checked;
});
if (hasKeyword && hasNavigationTags) {
return 'mixed'; // 混合模式:关键字 + 导航标签
} else if (hasKeyword) {
return 'keyword'; // 纯关键字搜索
} else if (hasNavigationTags) {
return 'navigation'; // 纯导航标签搜索
} else {
return 'none'; // 无搜索条件
}
},
// 高亮标签关键字
highlightTagKeyword(tag) {
const searchMode = this.getSearchMode();
switch (searchMode) {
case 'keyword':
return this.highlightPartialMatch(tag);
case 'navigation':
return this.highlightExactMatch(tag);
case 'mixed':
return this.highlightMixedMode(tag);
default:
return tag;
}
},
// 部分匹配高亮(纯关键字搜索模式)
highlightPartialMatch(tag) {
const searchKeywords = this.stagList
.filter(searchTag => searchTag.type === 0) // 只处理关键字类型
.map(searchTag => searchTag.tagName || searchTag.name)
.filter(keyword => keyword && keyword.trim());
if (searchKeywords.length === 0) {
return tag;
}
let highlightedTag = tag;
searchKeywords.forEach(keyword => {
if (tag.includes(keyword)) {
const regex = new RegExp(`(${this.escapeRegExp(keyword)})`, 'gi');
highlightedTag = highlightedTag.replace(regex, '<span class="keyword-highlight">$1</span>');
}
});
return highlightedTag;
},
// 完全匹配高亮(纯导航标签模式)
highlightExactMatch(tag) {
const isMatched = this.stagList.some(searchTag => {
// 只检查导航标签类型
if (searchTag.type === 0) return false;
const searchName = searchTag.tagName || searchTag.name;
return searchName === tag;
});
if (isMatched) {
return `<span class="exact-match-highlight">${tag}</span>`;
}
return tag;
},
// 混合模式高亮(关键字 + 导航标签)
highlightMixedMode(tag) {
// 1. 先检查是否完全匹配导航标签
const exactMatched = this.stagList.some(searchTag => {
if (searchTag.type === 0) return false;
const searchName = searchTag.tagName || searchTag.name;
return searchName === tag;
});
// 2. 如果完全匹配导航标签,整个标签高亮
if (exactMatched) {
return `<span class="exact-match-highlight">${tag}</span>`;
}
// 3. 否则检查是否包含关键字,进行部分高亮
const searchKeywords = this.stagList
.filter(searchTag => searchTag.type === 0)
.map(searchTag => searchTag.tagName || searchTag.name)
.filter(keyword => keyword && keyword.trim());
if (searchKeywords.length === 0) {
return tag;
}
let highlightedTag = tag;
let hasKeywordMatch = false;
searchKeywords.forEach(keyword => {
if (tag.includes(keyword)) {
const regex = new RegExp(`(${this.escapeRegExp(keyword)})`, 'gi');
highlightedTag = highlightedTag.replace(regex, '<span class="keyword-highlight">$1</span>');
hasKeywordMatch = true;
}
});
// 4. 如果有关键字匹配,返回部分高亮结果
if (hasKeywordMatch) {
return highlightedTag;
}
// 5. 都不匹配,返回原标签
return tag;
},
// 辅助方法:转义正则表达式特殊字符
escapeRegExp(string) {
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
},
isTagMatched(tag) {
// 检查stagList中是否有匹配的标签
@@ -943,7 +1036,7 @@ export default {
this.searchData(1);
},
// 清除
handleClearTags() {
handleClearTags() {
//清空所有的条件
this.keyword = '';
this.ctypeList.forEach(item => {
@@ -969,7 +1062,7 @@ export default {
this.navTitle = [];
this.searchData();
},
},
// 导航切换(录播课,线下课,学习项目)
handleTypeClick(item, list) {
item.checked = !item.checked;
@@ -983,7 +1076,6 @@ export default {
},
//点击标签
handleTagClick(item, list,type) {
item.checked = !item.checked;
// 更新course.tags
@@ -1764,9 +1856,6 @@ export default {
.topNav {
display: flex;
margin-bottom: 20px;
height: auto;
min-height: 80px;
align-items: center;
.nav {
display: flex;
@@ -1774,11 +1863,10 @@ export default {
.option-item {
position: relative;
margin: 0 15px;
.nav-bottbor {
position: absolute;
top: 100%;
top: 130%;
left: 0;
width: 100%;
height: 4px;
@@ -2006,6 +2094,13 @@ export default {
color: #999;
}
.couderbox {
// width: 5px;
// padding: 0;
// display: inline-block;
// text-align: center;
}
.coures-border {
width: 2px;
height: 15px;
@@ -2142,7 +2237,7 @@ export default {
right: 23.5%;
// bottom: 26%;
top: 0;
height: 20px;
height: 20;
line-height: 20px;
font-size: 12px;
color: #FFFFFF;
@@ -2238,8 +2333,8 @@ export default {
margin-left: 15px;
font-size: 14px;
color: #3d3d3d;
//cursor: pointer;
//position: relative;
cursor: pointer;
position: relative;
}
.uxicon {
@@ -2249,6 +2344,16 @@ export default {
left: 98%;
}
// .el-radio-button{
// margin-right: 10px;
// margin-bottom: 10px;
// .el-radio-button__inner{
// background: #fff;
// border: none;
// height: 20px;
// }
// }
::v-deep .el-radio-button__inner,
.el-radio-group {
vertical-align: top;
@@ -2302,6 +2407,13 @@ export default {
}
}
.searchbar {
background-color: #ffffff;
// border: 1px solid #f3f3f3;
// width: 900px;
// padding: 5px 20px;
}
.fixed {
position: fixed;
top: 0px;
@@ -2350,12 +2462,9 @@ export default {
}
.search-div {
//background: #fff;
background: #fff;
padding: 10px 25px;
border-radius: 8px;
height: auto;
min-height: 60px;
::v-deep .el-input {
width: 420px;
@@ -2393,6 +2502,14 @@ export default {
}
}
// .tip{
// color:#999999;
// font-size: 12px;
// >span{
// margin-right: 8px;
// cursor: pointer;
// }
// }
.search-item {
// padding: 10px 0;
}
@@ -2435,6 +2552,30 @@ export default {
}
}
}
// .course-form {
// width: 100%;
// margin: 10px 0;
// ::v-deep.el-button {
// width: 100%;
// color: #fff;
// }
// }
// .right-box {
// .add-btn {
// width: 100%;
// padding: 15px 0;
// }
// .ranking-card {
// margin-top: 0px;
// }
// .ranking-data {
// margin: 10px 0;
// color: #999999;
// }
// }]
.search-item-type {
line-height: 25px;
padding-right: 10px;
@@ -2447,8 +2588,7 @@ export default {
color: #3d3d3d;
display: inline-block;
font-size: 14px;
//margin: 0px 15px;
font-weight: normal;
margin: 0px 15px;
}
.option-border {
@@ -2462,7 +2602,7 @@ export default {
.option-active {
color: #387DF7;
}
/* 项目简介 方法一:外部 CSS 类 */
/* 项目简介 方法一:外部 CSS 类 */
::v-deep.el-dialog {
border-radius: 3% 3% 1% 1%;
padding: 0;
@@ -2488,13 +2628,12 @@ export default {
padding: 0 !important;
}
/* ---end--- */
/* ---标签管理 added by zhengsongbo on 2025-08-01--- */
.search-div.nav {
display: block;
width: 100%;
clear: both;
}
.option-item {
margin: 0px 5px;
}
@@ -2533,7 +2672,7 @@ a.custom2 {
.hot-tags-container {
display: inline-block;
//white-space: nowrap;
white-space: nowrap;
overflow-x: auto;
vertical-align: top;
}
@@ -2542,6 +2681,22 @@ a.custom2 {
display: none;
}
/* 添加标签样式 */
//.course-tags {
// margin: 5px 0;
// min-height: 20px;
//}
//.course-tags ::v-deep .el-tag {
// color: #387DF7 !important;
// border-color: #387DF7 !important;
//}
//.course-tags ::v-deep .el-tag .el-tag__close {
// color: #387DF7 !important;
//}
//.course-tags ::v-deep .el-tag .el-tag__close:hover {
// background-color: #387DF7 !important;
// color: white !important;
//}
.course-tag-item {
color: #333333; // 默认深灰色
@@ -2550,6 +2705,16 @@ a.custom2 {
color: #387DF7 !important; // 匹配时的蓝色
}
/* 添加热点标签容器样式,支持换行 */
.hot-tags-wrapper {
display: flex;
flex-wrap: wrap;
gap: 15px;
align-items: center;
padding-top: 2px;
//margin-left: 90px; /* 为"热点标签:"文本留出空间 */
}
/* 调整option-item样式以适应换行布局 */
.option-item {
position: relative;
@@ -2560,7 +2725,7 @@ a.custom2 {
/* 保持原有的导航底部横线样式 */
.nav-bottbor {
position: absolute;
top: 100%;
top: 130%;
left: 0;
width: 100%;
height: 4px;
@@ -2580,78 +2745,5 @@ a.custom2 {
gap: 5px;
}
}
.hot-tags-wrapper {
display: flex;
flex-wrap: wrap;
gap: 15px;
align-items: center;
padding-top: 2px;
}
.course-tags {
margin: 10px 0 0;
min-height: 20px;
}
.course-tag-item {
color: #333333;
}
.course-tag-item[style*="color: #387DF7"] {
color: #387DF7 !important;
}
/* 关键字部分匹配高亮样式 */
.keyword-highlight {
color: #387DF7 !important;
font-weight: bold;
background-color: transparent !important;
}
/* 导航标签完全匹配高亮样式 */
.exact-match-highlight {
color: #387DF7 !important;
font-weight: bold;
background-color: transparent !important;
}
/* 混合模式下的特殊样式(可选) */
.mixed-exact-highlight {
color: #387DF7 !important;
font-weight: bold;
background-color: #f0f7ff !important;
padding: 1px 3px;
border-radius: 2px;
}
/* 确保标签基础样式 */
.course-tags ::v-deep .el-tag {
color: #333333;
background-color: #f4f4f5;
border-color: #e9e9eb;
}
.course-tags ::v-deep .el-tag .keyword-highlight,
.course-tags ::v-deep .el-tag .exact-match-highlight {
color: #387DF7 !important;
font-weight: bold;
background-color: transparent !important;
}
.fieldbox {
display: flex;
white-space: nowrap;
flex-wrap: wrap;
div {
margin: 0 15px;
display: inline-block;
font-size: 14px;
line-height: 25px;
//color: #3d3d3d;
font-weight: 500;
}
.fieldactive {
color: #387DF7;
}
}
/* ---end--- */
</style>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff