From df3b1d716250af8042670ccea9ca5a3a9916d9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Fri, 12 Sep 2025 15:47:26 +0800 Subject: [PATCH 01/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/courseTag.js | 64 +++++ src/components/Course/courseForm.vue | 81 +++--- src/components/Course/courseTag.vue | 200 ++++++++++++++ src/data/pages.js | 3 +- src/views/portal/course/Index.vue | 305 +++++++++++++++++----- src/views/tag/TagManageList.vue | 372 +++++++++++++++++++++++++++ 6 files changed, 913 insertions(+), 112 deletions(-) create mode 100644 src/api/modules/courseTag.js create mode 100644 src/components/Course/courseTag.vue create mode 100644 src/views/tag/TagManageList.vue diff --git a/src/api/modules/courseTag.js b/src/api/modules/courseTag.js new file mode 100644 index 00000000..0368c0d9 --- /dev/null +++ b/src/api/modules/courseTag.js @@ -0,0 +1,64 @@ +/**课程标签模块的相关处理*/ +import ajax from '@/utils/xajax.js' + +/** + * 分页查询：标签列表 + * @param {Object} query + */ +const portalPageList = function(query) { + return ajax.post('/xboe/m/coursetag/page', query); +} + +//改变标签的公共属性 +const changeTagPublic = function (row){ + // 返回 Promise 的 API 调用 + return ajax.post('/xboe/m/coursetag/changePublicStatus', { + id: row.id, + isPublic: row.isPublic + }); +} + +//改变标签的热点属性 +const changeTagHot = function (row){ + // 返回 Promise 的 API 调用 + return ajax.post('/xboe/m/coursetag/changeHotStatus', { + id: row.id, + isHot: row.isHot + }); +} + +//查询指定id的标签关联的所有课程 +const showCourseByTag = function (query){ + return ajax.post('/xboe/m/coursetag/showCourseByTag', query); +} + +//解除指定id的课程和某个标签之间的关联关系 +const unbindCourseTagRelation = function (params){ + return ajax.post('/xboe/m/coursetag/unbind', params); +} + +//编辑课程：标签模糊查询 +const searchTags = function (params){ + return ajax.post('/xboe/m/coursetag/searchTags', params); +} + +//编辑课程：创建标签(与当前课程关联) +const createTag = function (params){ + return ajax.post('/xboe/m/coursetag/createTag', params); +} + +//获取最新前10个热点标签 +const getHotTagList = function (params){ + return ajax.post('/xboe/m/coursetag/getHotTagList', params); +} + +export default { + portalPageList, + changeTagPublic, + changeTagHot, + showCourseByTag, + unbindCourseTagRelation, + searchTags, + createTag, + getHotTagList +} diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index eef5a11f..b471460f 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -141,7 +141,6 @@ PC端可见 移动端可见 多端可见 - 仅内网访问 @@ -254,6 +253,9 @@ --> + + + @@ -306,7 +308,6 @@ PC端可见 移动端可见 多端可见 - 仅内网访问 @@ -404,6 +405,7 @@ + + diff --git a/src/data/pages.js b/src/data/pages.js index fa49ae36..5ec52049 100644 --- a/src/data/pages.js +++ b/src/data/pages.js @@ -128,7 +128,8 @@ export const iframes=[ {title:'查看受众', path:'/iframe/ugroup/view',hidden:false,component:'manage/AudienceView'}, {title:'问答管理', path:'/iframe/qa/manages',hidden:false,component:'qa/ManageList'}, {title:'待审核课程', path:'/iframe/course/noapproved',hidden:false,component:'examine/NotApproved'}, - {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'} + {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'}, + {title:'标签管理', path:'/iframe/tag/manages',hidden:false,component:'tag/TagManageList'}, ] diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 787b52bb..cb7bdbae 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -43,7 +43,7 @@ :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover" :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
{{ - twoList.name }}
+ twoList.name }}-
@@ -284,32 +284,40 @@
-
+
全部
-
录播课
-
线下课
-
学习项目
- U选小课堂 + U选小课堂 + +
+
+ {{tag.tagName}} +
+
@@ -325,9 +333,9 @@
- 搜索条件 + 搜索条件: {{ - tag.name }} + tag.tagName }}
清除 @@ -507,12 +515,14 @@ import apiTeacher from "@/api/modules/teacher.js"; import apiUser from "@/api/system/user.js"; import scene from "@/api/modules/scene.js"; import apiUserbasic from "@/api/boe/userbasic.js"; +import apiManage from '@/api/manage/manage.js'; import interactBar from "@/components/Portal/interactBar.vue"; import courseImage from "@/components/Course/courseImage.vue"; import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js"; import { deepClone, param } from "../../../utils"; import apiSearchterm from "@/api/modules/searchterm.js"; import apiPlace from "@/api/phase2/place.js" +import apiCourseTag from '@/api/modules/courseTag.js' export default { name: "index", components: { @@ -534,21 +544,43 @@ export default { }, stagList() { //计算出选择的内容 let list = []; + + // 关键词 if (this.keyword) { list.push({ type: 0, id: 'keyword', name: this.keyword, + tagName: this.keyword, checked: true - }) + }); } + + // 课程类型 this.ctypeList.forEach(item => { if (item.checked) { - list.push(item); + list.push({ + ...item, + tagName: item.name + }); } }); + + // 热点标签 - 这是关键修复 + this.hotTagsList.forEach(item => { + if (item.checked) { + list.push({ + ...item, + name: item.tagName || item.name, + tagName: item.tagName || item.name, + type: 14 + }); + } + }); + + // 三级分类 this.oneList.forEach(one => { - var twoChildChecked = false;//是否有下级 + var twoChildChecked = false; one.children.forEach(two => { if (two.checked) { twoChildChecked = true; @@ -556,34 +588,28 @@ export default { var threeChildChecked = false; two.children.forEach(three => { if (three.checked) { - list.push(three); + list.push({ + ...three, + tagName: three.name + }); threeChildChecked = true; } }); if (two.checked && !threeChildChecked) { - list.push(two); + list.push({ + ...two, + tagName: two.name + }); } }); if (one.checked && !twoChildChecked) { - list.push(one); + list.push({ + ...one, + tagName: one.name + }); } - }) - // this.oneList.forEach(item=>{ - // if(item.checked){ - // list.push(item); - // } - // }); - // this.twoList.forEach(item=>{ - // if(item.checked){ - // list.push(item); - // } - // }); - // this.threeList.forEach(item=>{ - // if(item.checked){ - // list.push(item); - // } - // }); - //console.log(list,'list'); + }); + return list; }, ctypeTagAll() { @@ -613,12 +639,14 @@ export default { }, data() { return { + hotTagsList: [], newData: false,//线上品牌系列隐藏 navTitle: [], // 设置高亮 twoId: '', count: 0,//分页总条条数 showUClass: false, + projectDialogVisible: false, ctypeList: [ { type: 1, id: 20, name: '录播课', checked: false }, { type: 1, id: 30, name: '线下课', checked: false }, @@ -629,7 +657,7 @@ export default { twoList: [], //二级分类{type:12} threeList: [],//三级分类{type:13} searching: false,//是否正在搜索中 - + studentInfo: {}, resonimg: {}, formatDate, formatNum: formatUserNumber, @@ -687,6 +715,17 @@ export default { console.log(rs.message); } }) + //初始化:获取最新前10个热点标签 + apiCourseTag.getHotTagList(null).then(rs => { + if (rs.status == 200) { + this.hotTagsList = rs.result.map(tag => ({ + ...tag, + checked: false + })); + } else { + console.log(rs.message); + } + }) }, mounted() { let screenWidth = window.screen.availWidth; @@ -852,10 +891,54 @@ export default { //搜索条件 stagClose(tag, tagIndex) { tag.checked = false; + + // 根据标签类型处理不同的清除逻辑 if (tag.type == 0) { + // 关键词类型 this.keyword = ''; + } else if (tag.type == 1) { + // 课程类型（录播课、线下课、学习项目） + this.ctypeList.forEach(item => { + if (item.id == tag.id) { + item.checked = false; + } + }); + } else if (tag.type == 14) { + // 热点标签类型 + this.hotTagsList.forEach(item => { + if (item.id == tag.id) { + item.checked = false; + } + }); + + // 更新course.tags，移除被删除的热点标签 + const checkedHotTags = this.hotTagsList.filter(tag => tag.checked); + let tagIds = checkedHotTags.map(tag => tag.id).join(','); + this.course.tags = tagIds; + + } else if (tag.type == 11 || tag.type == 12 || tag.type == 13) { + // 三级分类标签 + this.oneList.forEach(one => { + if (one.id == tag.id) { + one.checked = false; + } + one.children.forEach(two => { + if (two.id == tag.id) { + two.checked = false; + } + two.children.forEach(three => { + if (three.id == tag.id) { + three.checked = false; + } + }); + }); + }); } - this.navTitle = [] + + // 重置导航标题 + this.navTitle = []; + + // 触发搜索更新 this.searchData(); }, @@ -893,28 +976,33 @@ export default { this.searchData(); }, // 清除 - handleClearTags() { - //清空所有的条件 - this.keyword = ''; - this.ctypeList.forEach(item => { - item.checked = false; +handleClearTags() { + //清空所有的条件 + this.keyword = ''; + this.ctypeList.forEach(item => { + item.checked = false; + }); + this.hotTagsList.forEach(item => { + item.checked = false; + }); + this.course.tags = ''; // 清空标签ID + + // 添加清除三级分类的逻辑 + this.oneList.forEach(one => { + one.checked = false; + one.children.forEach(two => { + two.checked = false; + two.children.forEach(three => { + three.checked = false; }); - this.oneList.forEach(one => { - one.checked = false; - one.children.forEach(two => { - two.checked = false; - two.children.forEach(three => { - three.checked = false; - }) - }) - }); - this.twoList = []; - this.threeList = []; - this.navTitle = []; - this.newData = false; - sessionStorage.removeItem(this.localSessionKey) - this.searchData(); - }, + }); + }); + + // 清空导航标题 + this.navTitle = []; + + this.searchData(); +}, // 导航切换(录播课，线下课，学习项目) handleTypeClick(item, list) { item.checked = !item.checked; @@ -926,11 +1014,24 @@ export default { this.searchData(); }, + //点击标签 + handleTagClick(item, list) { + item.checked = !item.checked; + + // 更新course.tags + const checkedTags = this.hotTagsList.filter(tag => tag.checked); + let tagIds = checkedTags.map(tag => tag.id).join(','); + this.course.tags = tagIds; + + // 强制触发stagList重新计算 + this.$nextTick(() => { + this.searchData(); + }); + }, //三级分类 handleOptionClick(item, level, list) { // 线上品牌展示效果 this.newData = item.newData; - console.log(this.newData); // 单选，排除法 this.oneList.forEach(one => { one.checked = false; @@ -1307,12 +1408,18 @@ export default { }, getAllChecked() { //获取全部选中的标签 let list = []; - + //获取选中的课程类型 this.ctypeList.forEach(item => { if (item.checked) { list.push(item); } }); + //获取选中的热点标签 + this.hotTagsList.forEach(item => { + if (item.checked) { + list.push(item); + } + }); this.oneList.forEach(one => { one.children.forEach(two => { two.children.forEach(three => { @@ -1375,7 +1482,18 @@ export default { that.course.sysType3 += item.id; } }); - + apiCourseTag.getHotTagList(that.course).then(rs => { + if (rs.status == 200) { + // 保留已选中标签的状态 + const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked); + this.hotTagsList = rs.result.map(tag => ({ + ...tag, + checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id) + })); + } else { + console.log(rs.message); + } + }), this.isFind = true; this.course.device = 1; if (this.course.pageIndex == 1) { @@ -1417,7 +1535,7 @@ export default { item.name = item.name; } }); -console.log(res.result.list,'data') + console.log(res.result.list,'data') this.courseList = res?.result?.list ?? [] console.log(this.courseList); if (this.newData) { @@ -2421,4 +2539,73 @@ console.log(res.result.list,'data') .option-active { color: #387DF7; -} +} + /* 项目简介 方法一：外部 CSS 类 */ +::v-deep.el-dialog { + border-radius: 3% 3% 1% 1%; + padding: 0; +} +::v-deep.custom-class .el-dialog__header { + height: 100px; + margin: 0 !important; + padding: 0 !important; + background-image: url('../../../assets/images/project/title-bg.png'); + background-size: 100% 100%; /* 完全填充 */ + display: block; /* 避免行内元素空隙 */ +} +::v-deep.custom-class .el-dialog__header .el-dialog__title { + padding: 0 !important; + font-size: 35px; + font-weight: bold; + color: white; + margin: 60px; + line-height: 100px; +} +::v-deep.custom-class .el-dialog__body { + margin: 0 !important; + 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; +} +/* 热点标签：自定义按钮样式 */ +a.custom { + /* 基础样式 */ + display: inline-block; /* 使内边距生效 */ + padding: 1px; /* 按钮内边距 */ + margin: 1px 5px; + background-color: #F2F2F2; /* 淡灰色背景 */ + color: #333; /* 文字颜色 */ + text-decoration: none; /* 去除下划线 */ + border-radius: 3px; /* 圆角设计 */ + font-family: Arial, sans-serif; /* 字体 */ + font-size: 14px; /* 文字大小 */ + height: 24px; + line-height: 20px; + /* 过渡效果，使颜色变化更平滑 */ + transition: background-color 0.2s ease; +} + +/* 鼠标悬停效果 */ +a.custom:hover { + background-color: #DDEDFF; /* 浅蓝色背景 */ +} + +/* 可选：点击时效果 */ +a.custom:active { + background-color: #757575; /* 点击时更深的灰色 */ +} + +/* 鼠标悬停效果 */ +a.custom2 { + background-color: #DDEDFF; /* 浅蓝色背景 */ +} +/* ---end--- */ + diff --git a/src/views/tag/TagManageList.vue b/src/views/tag/TagManageList.vue new file mode 100644 index 00000000..788ccabe --- /dev/null +++ b/src/views/tag/TagManageList.vue @@ -0,0 +1,372 @@ + + + + + From 98ba239494401c652d611d54b5c727073659b10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Fri, 12 Sep 2025 16:14:43 +0800 Subject: [PATCH 02/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87(=E7=A4=BE=E6=8B=9B?= =?UTF-8?q?=E6=96=B0=E5=91=98=E5=B7=A5=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E4=BA=86=E6=89=80=E4=BB=A5=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/project/title-bg.png | Bin 0 -> 48665 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/images/project/title-bg.png diff --git a/src/assets/images/project/title-bg.png b/src/assets/images/project/title-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..d754fb014c660c9afb1bcffac430d5fa6c8a5369 GIT binary patch literal 48665 zcmX7vc{o)6`~S}{IL6?NEMuQBE!G-ql4TZKrO+agWhjv~WGBX%p(2V(=^Yc57E9S9 zF@#EGjjTh3B71iAJ)ht2x?CLpFf*^$y*;0g`?B2;D^ZLb1^@uj1J>q80RY8Cp3i`S z$ag7qG9LiM0|(5h$0J+^hlDckzrC|-eYx%Rx!IxUFEt^vZPV9Yq@sj^1-JRvFT2ZU zUueQ7zH<*2<2xXDmYC2=*iIx0pXHdR+tI3TJ`8x$^GhM$A^cg56z;aK9DhCA zE3scUdO79OTF!c1u`~I;uI`&PvlD;fEG+)ptX}>4uqF0i^;pfPjj1cdbK!1VUuB2B z+{*b9J5+J3rf?+oVCA2UBR^e(zh}-o6m)q1@J`9qozOMxqj=e2tkHcm-h4I`Q5+V&hKunwL8B%;WVb&uU_!| z5B_~-^|e(Un^5rEtMb34_W0|aJXj>xwAS(Ap0cN_@P!=DB8B5#MG;T1fA^i8`>dgR zTU<5qlK6L)PKeJxoe<&g9`APS@nhZ$c_;E?&h6yBO$E2W2faqOMT5TDR4eGVKOF2_ zSD6sXx=o8qmM!~wnpiEdxZo9X^Sf0syoq1PIB77DQ;X5~p5r#)R}>dpx~BI1T%eyp zZ|x~YoN)DWA!c!^Qlo8F@MP8$`*_w=l0%l+YiFOo#6Y;VBO_9B z(LN*6=EsG$mc!%1tr=Oi6?YzQxBWcm^{T3^-|K!uOuyg#i+6_jd<Wq#n{k?Un^e5@3$j{2$uS;(2G})4px7a4l^V)l8 zu3XJ=tW)Q~$ggMB-o8KY>KcYs8xC-_kGvRpuh(I+%-+@QtJkn&&rI*$li}8L7bE_C zxoa3${4rIrHX!Ljq>zrej--y?me^vzJ272_1=pWqx)KY2*@|A%&5B+zU&VBNy2Nw^ zbYd697IEJ*t|*3u{SebFj!HV^SlXpoG~{!Oc4aE;uGF9X9}l)ZU3c-iNN>H%{5o`C z*}S;dU~FR#ZZr1UiDF{($GciBa_jr89QIBR3;nwjR`_(_Yi;eL!kANMr#9dIa8BCY zSM_7&;gnq3q1gSuat=jl?fd(3LOShD)kbHcOz0kiiBLD6Ptz6s_rCZS?kgWK;s@_$ z5FdwXXz$v_Oc{Lw6Rk*if@Uhg*oxk_>pQbfo)6yg0EMabvz;<{D$|a<9Td`mvouhp zAdTgM=Bz7RvZY6?Q4%0rOad+xQi+hoy42~x5>)bAJ9;wks>gE`vx_@dj$zL2Dptdy zxHwS*wmt|M#E4rKQC+>A-vQ*x%w1TYfsqZ-`rf8i+&^Pa5hdq{|26J|P&$tw`uFWVrR!ZQcv_*=^s6uksV-lhWR35VZ$ zIVkulz}*qg)1d@KDw0+M`H3F4-j>(}Ur(9)_IyX*(P`S3fWu}Xm%{gMPV|ZXs|Ggu z#Y$_VYEC(I_(=!$dq`(~QNCYO6gB<)&yQXC!$1C3kF5z@T5kxs8s^p+d%3z~Lnp*_ zMQVIH;91+xp)VlvNk|;*21(!{0q#-pQCSlg(su*AK8+T{ug4X=Kr%<`!&`^6${T19 zhS`ltdx2vcI7(Bk{eyDPC-QN86H$$ZtFroZbPz?1%`Z#ilBwjw{g`6>@cl#5LP?!?`v5+HsaHFx}wu)-bKM%(W(O(V`zuV;oP9ZPM1a9dB1sabK6>`KG{h;US zYRCw*i)ESIx7I61;|4wpOgsfX!8!RQRzpV)6EZCeh@tp#8aVe5GTi|_g4P`h16TOjN97{SKrrz>Y@_+XD(Fa$nC?hbD6tq2cdj)A4A5YZg{`Pb#t z5?G$G$4qVqRyWT+Va_AP7f#NlOybb1D(ELTBebj`yqll1o`N%{oYlPIAH>_qB>N}A zu4bo(HqdmqJ@t?Y%>T{7`kfEU6hq?%*(Ep6J-w~bc5`1Lq`mnA_40VK0)}C{<)iGAIZ-tARwmNo^ab`(rz5lBgMm4<;=Yw)6Mh+An9Z+1cTJg%ik< zaiDhuA-aK|@)Tljj=<|@i9jGs|*8pON^g7%*^~@mrz*e4_SwujC z=xwt~JLt4JSOlOsqG2q9zKdFfDlzDEVBKRvem?YTi&}0qxhyP8qmqTV@jSLByoIYz zl?C@GXHh1h%v+BK2z19=vX>wErxT|0MP0jXnZ=8DM@9DGJ?QxkSt$n=$uVlm=FGVt zn(VTjALp!!9mwoXOsp;%ET&>PQmz_>=~nsiih8f7lC)#+=D6%!`dm1@T6Dp&tdkUx zN+-+E{E{KRD`?l$ONVDe2u(O2X__~y@fX-wh1&^X*l!x=C&7evMgbwTu$?|hh6j@i z?eyuX42+9h|F$JS5X^HZAZ|zRLsBmA+WGO^70{zZYFJ+i=XYfp?6RCB#}x1)GEr@1 zw1b17i^dXkkc2I4r}o_tVf2x{6WDzimndq~p#mvdka2$?!`GGcy`uo5&n=UZNFGp2 zR27bwg%*j^&!tr2@8PMU3_ZDvsbn8kGS8h71X>UsUuHlGcL;_Yzg@G!w~}@`LJfnj zsY&h=c^#kPZoS>JXW!(Hge+=F2w0kDFG{TBo)Fzn*Lco!NG2UkV`wo9&s|*0@j%z? zHXL1;kp5lQM{=|Q?^}RH4qy>KT9!MDV?MNEkylDm*y+F^;Q+x#Zgj_1wdnY7@kfw~ zcQ+_t_}Xle&^^1~H*qH22F@vK_(VPf?r&(PCg*j^oW0rmGda`F9262xu6h-w3cez< zrG%4F^x-|v$!2uypJd4ukrC81!EonRV+nFmjKwa3f4x9btEYW}9VttM<6bb=rMmto zIU3&Q-=1c9K~uf3|d?*`*-T}H`+|dl!9m`1JNnfTI z?zoniZkY!tv9;ThpvC$ne=FIvX2=MOqhg4C3WR%aFFP|tJo^ri+8WcHi3CGiX!H3^ z611SiI5gwE^wy%V6I>)N37s>JR~H~+K}+bMeA~=6BM`YkcZC?sC0L?0^lRs&SaWC= z1LhqWLC@Q@dAH(Oyff4wqwjQuB%0|*YPwi!H|x48&Dy_YbP`gEcGk?)jH{;Bc6;j{ z6x?sUn|TV<)|d)kb(plwzlv^LOCEjobSR{^TVa-1o4@fuTL#6H33c=O^xMJjQ}fQg ziw_CO{&q;~at6x}#{?g@%zGD+NeE4aR)nJ2me&5{V%)*qZ0S}=hZzYi5M?RTJN!b= zUuvh~e~WwJn&#D%imJJ!tTL(*l<}5~;bs}o1vrfmDip7ijG-!~=5on2ZEgvTi+^=S z`*~|a$qjOo_Rl~;{s?dkdS_>Ib4^Pn**_h6E{WDaHN3A99rwV?G5Q6+IV2OB^X!cY z8M3M4l+~&5sgK2|Hy|yEqx8Sut>n_a=)#_OS}KvMiu4^J^BT$S@z8*K3}xqlpc>!k z?_>OM3dfhF%{G*K9sa6}`*RS~XLE1?AMPo|D$GT1=J}TyVYgg~)IJ5qq#TD`;;vyM zKf384&S*f2AMBN-nCe9g^|a@bEz$|!dHCa`EZXFXNS*qJHRleZ$V zo*16CdqlT^>OS>2VfaQ*fbo?=JI~~g?Vf$!rW$We8t=}-yi*Yt4>oQzPJ}xPYL(!f zc$g4DLWEQA37Dt$xk!JPnF#0sG|V17cwD2+2mXab6e_u$j+0`sNF20= z)}L)VAJ|S^%{!y_UfA>4X6*UIJ^sJWY=190w{hU;|C+fy0ZAzOrR1HMZ{a?CoJKOO z<1EyYV68gV+FeN>-fKe*%{w}*i^VTwNv6xEY_Q{%2uY$idBS)v{fyh(f07LcS@o zOoX{atyIVJzPj9|i=1X0xg?E)cdky$0TAx=Auw*`>mLOGDM1duoH=Iu)WP)*Z}H|i ztmFPfyS-eIbw2{yg;Wb_XBr?E4*LE=^_pJkV+$Nj$W@wVBJsoW-7br7{5o*1`@}r| zV6fZD2an{rhabtxO?bMKK*I-DBMdv<^$N#oUdsD&G4Cm5J65Agk&hi3Z%N+V;XX-O zirfW6{C3|fb{73JzkoY;j!C>PVS&a~<`E}pp7ukai#&YdNU9(x#s1lIxlA<7NRG9M zBf^6KUV^y~@*r*M3bs6uh>88s)Qp8eWxm@*RxD^m;Do$6R+viJElzu53$707YO&kP zxwXEM@Tk?#|7bpNj-C}{ss_EnsnPpv8gNfc$=?V~lNos}Vhj!9q#Ut=3I`GDWi0bf zfkO;gQQ}!2?AReb<)WF3{g|zv9cY@u&0jAH5~2AIzA&0Vn=Cr~{Q4G!MJT6G=S*4) zB$Qa4J>dBSW6Xa}b-Hq_u{gr;woq{Fr=4Yx)sbz3Kg3&`phxZdrb9b(&Rt6Dm_j#x zvTJL!eKUObxh$}wTW&4fVH>*-)Q+LFdODKu4i#B%yTvNA1hRk4sv9kSJxf=Ne{5QV zk>j1O4;1Ak0Yw6vU+&Br^P@KF7BzRds}`oqaRztT*rvX+1m{M*yL03&LPqH5+fGK> zm}=-75y>u=^rW*#!JaK@tVj1=t^#mj1iCcSpIfuLL1uCu15*lKOv#gL$ugFHsVMqh z^|M&i8$x^M(!a4ZDpFgk zFK9B8H2^~gpe-StDN1gblZI_2AV2pxy?BZG&z7F{4ejOB5%96s3fTD0UN%jIjf3Y+ z8H1QVKkfCEq_A5Np$@ff$*D-$oA|o#=TG|p76w0{sX!}!%+Rl2oW@4*YL6b?C1U4Hwj<|+H{N${~BO)wLj>(@3QZoBrtad zn2Y}WTzllu4tSy!CbOy-aG1v>n!em2T6}+UIM@|7irX1|MbKS7|ki8 ziF4#q$MtD@*F*6tahrEr9>pBY9B`-Dl~ae%s0NX)svI@YB~*7QI;pBxRW%B)i-H8G zPHD^sN3IZmoIQfg^SylY6f{zxcak2rEIlz1xNClu7;|A;+jhmP<2#fs1tF{a8*Sdl z37aRxU^rL)Y8W39FTG%3P^w*U9uqlEd;?jW>+F4E9&fPl3)OvKt_wuE3;EP>4?`{Y z0%8hz6ZvFMssW}-*V*lH96hd$M(75NWP3aMWJ{i0W8{2<9xJ^+msygNVyOuKZ7T3h zjD#fEYmfvJL+{0iPzzRsV>N6DDYi(7*}9CJa57r(akEskWkL|r65*nQ_b6mB8f)3&kl7Zb8==sd;JBGJSD>Qsc`0!VAHau+6@FfJR z#qEQ}cUq)#Ckt;i%}Ozq8cn>U;;SUI{nAYuqr8(Ywu||qn&kNAOCMz9oI3G$Xt!@$ z_^apoBhAK%Q$``3y1S>;l6jRmYV-J44)`2}6KReg_G@;PE_M_o&hasW`0Ep+;Rw5( zR6DA5bYj#cvJmaHOaYzLA+y(MGkSfYR_QYP!sH`OX1ACug%78_9oq3!%2MNGwB8kJu=_{42SJzNuZ zU;W%JR?Oa%lpC`}z0Ki+%|hly$+eb!9^kXIyOIs<*fk$LIoe*N{Z6-hfT5jF6o$p9 zLZixPBpxN;JT$jM7>3TnVzkzeAo07j!qraiZULZ+@YEr>TAvDy96O5c@s_lDs0Q0> z+}qi!il&NkTA&roIW!iBXfalK$_8I0=|Y^w^cCUk5bYR2UI-DZ_DV_+yJpG=GnPxW zobUzdr0r;#r!NX9)>`fKEJB|!Yyt)Na~GCo)wrShmj_En)~D(Lg}Q9-bp$D~8Td?)p#munJ~5>I4WtMakUV0Oe04XI`I zdSo~}83_?@*`cw;aoLHge?x<;ABifF;1tI2Ypx$@JDAa->WM#cWxeIu6S@xU&c{He z8ya6w=<6MTKI}QAMFgt_aNQ6s;6FzKn0vK(k44axI_n&k-3X~WHGNqaM>mJs8_Dp1 z3W#g)(~!jK!!c3arq}Z9ueckAWFIERI91Y;7~}0W6NPqeoLoysh&D)SqZMe!d{s=h zf7Vz+fYr-v!9EoGmQ^0Z81q6Fd?NMUTasuFC^CJahOl9gCTS3=I|NqHMf{Sa`^2f94;j_`T#*it9p{-;Lk z8ynZHLO!PY#s;bxlHEKV{UPSoZP1K0>acldLvd>Z;BbRZeA|sl=%f6Obndw9@@2*d z2N;j~fJLS$1eTp9XL8;qyj#BAV2{HTtfp^^kzQhx4mWAm)rSp z^-lm^C>mOLH!dbv!bEL8S5Kj?k!|pa9{k^>lc5>VHuW;WSQ^-d4axW$WBX}#J8@}& z*;idoISMR3nC}99eclce&+ZkHS7G*5g@ktq+ZGR5ftIIik(3{=T+TfwOFJ!0?*WG* z^n_^H72MKme8g)O^PB+?sXOQ4t-Z~uWR~5skdNkFh0Fs3gqVOK6M9l^BAG_!AKDpW z`g}Jo4sh8VuB1(o^G}r1b0ix;dP0ypR^|0=LR`S%5S$<-|E6o#d7nQhbM1H{2cO_5 zOmMiX0W?0#Rs7q^D4^trfjpQ0D9LMUJoSyzhEsDG){2NMRg^faxE)N|4y_wFJ}Wv5 zpGz@9U;3w1bg@XZf3i$fWwJjPjmYV=ZQK7Rz9Wqc6g(9nOzq3MI_keo-cOKgj6H_5 z0i#XchMF0y^#9G@LlNCn&_CUolhob}1?1&_vll`pN89(_$2}*Jl&YJ|F#km?6QglU zN-eW$tR{<&keS->fC*goYI~l2xQ8C4@4RAMpjMz>S8tJ?#vwDk6AwxLUCj-TA{*ts zrq~USg14f*)?Uea_1`@){#(j9#41m$Ved)Sg#vmINb-ImFoy3guh#~6hOKbwZ?E7} zHFx;HBSL61G+-tOoTGZ349%*(8G~*lTXwr$JN2{~s5H(Zf7>^O1D(;eFesr=ri>2==`#5lcSwIN~iv5ewU3t<02F79vfa0`8#NTH6&E(PGzU?IZrjH-gn?V)4hC zFMuk?tt>umxvpm3RR zDa*n&HLv+AKACLSLGf=03aV z!9TsrAoxvOFI6?wuAjhe=E!mF_d&0AsuIy7w|5$TAtHb21T{il5GM)Z-lzg&ipgW! zW3=p{vBolCQ^kfoCfavt)_8S9P))v&iij@IE8|Uj6xK(xU-NQHp1p=98VP^c-M7KA z&o|Du8{GJG4!v;*YRIGFQ>}GVOAZtK^tXM8U>h0g}KWRQ(NrcfH(p zfaH7srImx3PulY+t`b|XD0V2t<@JGncX>izvsO@fV8ZxNIhNOY(NOSaSFWDm59ws! z$OsHnEaD|~lAH*9eJCI-%c3V3|H#rQmoQ1N!C~L|!fT_6q=mamt*_;scIGFPN+56D zbpMyuk%v%J^mgrJF*?o0Gb{d2F=7V9bNKA3$qX=OHxZk567tx;gg+0yz=dgve(Rti zs$(~Dnti0W$uKOD(09($SnlIK{a?k0+lO;0s(2kZohspTWxkGZA9@>0-HT`g^CR+3 zir)~a6Oe5L=S^rH3?!RV>g%NQOPm;rZZ` zukFvqEj{YjMWfa9RC)-(8u_ZAa03z5BFXh-cdysLDTHg5z8}l+i0)f#LuUUS*tzN0 zooX&X`(LO(C!zm=zIqZjU#Johi>c64iusL?Svdv7g?~SLL!>c6C_Y@MtYJVKLybwD z+_$NRcqHM6eRaZ7!5||{?`bn4DQ!nru6a!oQplmH$f#3f&-;%iz<7-3i+_dlz&Ffg zl@Hh9DlDNo0udBwkVIPYST!MJvT{51<-Eh~*fZCTF9`zCj{Lw~9W>cLL9Bi^mL~@U z{n-}J`?lQrzGeElR9ZjjgYpZZlg0tJi`Lq8nEpx)4BzkMl=BICf;XiNAEux-At0qC zSJBJ#3{{G+kEm6W=tMv{$~)y+w&&dz;&92uQo*HNz>LnKoKc&9jX`#o_;a0IijDz! z(@E3L4BPdXhbBI=>d~DuJHqmoAK3q;Kf~zD*Npz&fsBgVeHl)Nejm_E9~WJI z?w>uqD9lU!EX}sIcJ(GUd#-Q5VjC*OQNpIG@ldAE&>N1rpkkHtnl+hJ|#zRtU zvzU(z$9MRn8qXit>2~8iwq-itIg{?0`mA*Fc4!-zG(Mypnp$E&wY%%yDTt%8A!s`| zH5N-v&4mZt{o*qWEn?z~n1{70h8b`%$@2knzZ!iwI4|OH zAuq4*)B>@O+rhXsx~>>K_9izKN%9WdcEzlY70^fXAT;*GJ|QSBo~+0H9ZyJF7CM_& zVy6*$c&>1)@KMpGiSPSpI}yFJpHF3=ASd3db2R?#zzcz9KuImGPwCWhy2;BWYAb(* z$49&R;vEBgsD>9iBJhtIZ3g2#?TkhH1H34vg6MMr0V`TTN)?n=8Z{jeEuQ_J(`x6R ze9-T1Fw<{tDD_TQv|VV94xH@%t&^iyksYXX+Ux2x(@-!tf}>>wetpv_9s8nBI<~G! z`nSvZt6?$&4_wj}Klt0XV4S-vI;H*H&R%tL7qg}c|xaa2EM3{4U@I60t5?6uk3*|}}t=g;nV zim`I9@#=9Mo~ZjArkR@M0Ya`zIv$Qby9K~K(faPmq|Rp`SN)(8e3Cyj3(GtJQsQR{ zATc#PX_kRC^u^L2@f4N?`C*u+%F0!`tPTd^z`(byj+q37UEsBI=-DP!^z6~L<bG0qaRHy-sAi7uvDW>Lu~z^wyHt>E;OYzIEhDR^7xlq zC0fTermtJ9^!G~z-o^P=hKRr^RN$e&5w^79iSl||us#eZG2zb*Owb1jySmVC&~PRn zR8$YduWrE~Pz__RhQ@oN4ep*si=*O&(DktZZvx=mKbyik0t5*GNUpCy#TNqZB0!bD z7O6@Ar}@G{^kD_!ExayeTs^fDdW2VTLN#jo{R=q&X#&IwdVEP!%(nvpEV;(E1iW&pnJM(jtUuh?`V= z;)#PQ@_&SCaB3uLi0}M*>=n;`B%OyZ{dFI9)I&_;zg`jj;Mq%diZ?DCZZB^zqb@*8 zhwVtJkR@;sq$Z?~UR{)lpAATMp1rRyQ6x??z9RMpP2C(9t~BdAMXEiw?hrD9tvgg8 z-ezZt_zj#p{&iADkUngzB8oTNcj!pEmlJ~sMy5gE>TU>I<(Uv)6VMzqF%Q&G%yT~Is#ZHOIXWQ%&vwd9p*|59W8jkzVZ#Wmdl`-oaSYFdMqUACh26*L&O~YLZIT%|NHR>{G!XW(3k)HuKYxp z8ZfEd=EIVtvuT`M}~~4&1)Kcj54mtxTgys!LLEW%5o1b#v*E{6VU@q zol62nZw9(+G;Pr=+skRqWWwYFdn}|9KPcE`xq3DH`(K{+|K!I@X-Q{p7-S(CqQML? z42T`0SnhjmG%M%@odN%#?tCJgp6Q*t*YQKtCrIxd zDD4SwAEv)8ulab%=%rmMO@L~KaZ%5+qqe8g5Nx8p+!$klmWQZ7i8M~L)Z#?;^o5=i zUKh5MO3UIZ)xO|W+!2ar;p;$T1=~Eeotjm_4J2Msq9OLjk?ZT05oPlQ%Bio8<*oAk z#W|@~d9`MUPmKsUu8(X9OR4QHH+eY>Z#O$4UaV!Vju#nguucxmmW*20-%Ar3t&Yz= zbR{>9fFIrlf1yrh@D&iJ-`vT_z0GYw^%3N1N{!xqjVG|RGrd+l9;R61xauL-%V=0`BsX&8rL#W6pA0*j0BSM&2z%|>nr}L`AYKV{4AbVst{7#9umsTGXaMc2QA^Hk2 zU}HwzwB;1*YMT}My7$+JTZ3T?px5{SIODdKIaIr;wZAmtnyho}mlXA3@12@%p5ro? z{C-^#y2F1+sZ0n}pD3ce(w7MEsK6WnhzJ_~Z<#l^f4X5`<$y_ua+&h20PU{#Tvwi^ zcS5Ppo}i?_1Tm_2;+Jwts=Fz?pClQJro??5F`!;ZwauF}^8{{FZ&9RsrVT`%3eZe2 zLph49y4p+6T%x^;x3=zMHlzl{ZLBzD%6LnTMY+7cy*|nDxP3s{v*#~G&aVLMnvXZu zhi;MmupdhxIHF+3*7G2~p#O*k#M3_rp%4@;uI|Q-S1}U zdSC?<;&tQ`pQbFGolb7Df1-yd!i3s%vW*jQMyl=_sZ)If!_V#+-vzrL#(Er~X?&06 zdh4kpxYqLw_=T$3$+ATQ5bSTO%cVovgy%}sUi2}LsMK)b6k51mSS?;OMTy$yJtKvl z{jUv&{b-`>UJ>*N@HiGEAn5|s)jS?kpB&xr!AF?5xct`+sY590Gwl?4VvfRFeFXkE z!jVgpW|HO7KKYylcgS%Ia7N&tzwQ{sLJ+FE5yISH{=i?EX9T_X&mWF>5oap0dR6p$&ls5G5tK0P7we-mFuUjFrWg8QNjFr!I zLo@%D3~DZYDXgfC$Xo-V&HU41jg)bRxyyEGxk^b68lX>LP?B16kHwMH1&*xcwc+0C zLw{EPOPn#ewC%O6N%4nYVNNlxu_F_DRP!KLDaxc+lO&$?_x67p)2NW9F=hTc;qJFh zp81nVRr;4C4}uOlOp71czb|Az`yCS>WIvx zK=i{DU#$}ZJdBfBWE(=0^p#&28LgC!pf5d&;;*My% z9$!&o7fB%)(O9yi^XS_;sRdV}N5l_#CdbHd8@X+#41!byCYJMY5OEkDV7?LD2F%{g&3|RwO4Rf0z8HmrU;M82=HobC-^_TjwhVO zB$3gpGk30Ncv=&ef-V;0-XK}D05|3>i9+*^g39pcP(&Cvdq1=7Q8Y`8wpZmM6ot*3 z_ZD$iMbyNgfWLp;%@EPYgv*y2)GpBsoiq<}ypX!DY_xhXk=*yctH4!qT&r@iGfvFW zQojJ!z4EBBn)`S&#>8XtmqTg5SL@Qi8Mo=Wec=PKrL!+LOka1+WM8Zq+Pi2_Gn?W3 zdqR1{BmDE`)vdDU@7hA4SI=;vR8ytP3#dCKdy_BAsSGP0Ujf%>TSxxgJ=!8ZB&Kmm z!$hTJRoZLW;2w(EyIbBN7Zo;aM0AiWg$mJj&uEBV;$jNoo`}{&wZ;0p=3+_h7f?7mV<72AZEI%n4L7bFLobz-}&=z=ld?W zeg8tXq8CbQ&GEtCx_*EDF&ziwyuXvKd*j~B13P1W4#HL)r;RxzN3$nhAGau+;~Ul} zOXiqSuRutij-NY-uwq2I<2Pqw(Mj>Ll<+6;z7d{jQ8E*zp@@`K?2|YhKlWJ01gGFqb=$)_Kfp>@`;t#+#=T zzay^}UbT3g>@J=_)|J)*N0&9>D9xwK!ndFQ=W`U8H)gV2+|Gm z$*v9?a}D{C6+8Y^+s!UcZ&_r~v(=XH&p0gSb=06~$me9%^604U@5b3Um9;Eg>>}<5 z`$g(=^7H4l(czfR5>TfpM|2Qgb)S+siDpB|CdE;M1V?m(nvjS}O@rxhG z4KzL_;lxq6*HK7TN?R~x4C`aU-7PQeWi0XhzwSbWOket^Kf-Y@u?W-Ml&BNx(M?5k z-&t`4m`JdbAZFc@5Zz$DGt7iS3AgT)>L<%?N-}pd3G^%>SBW$aQ+Q%~@n=-MDwq?k zHG2#=hBk>$?^@dUi-!@KE0n-?aP;|f)4`f_vV~d`@1T%N%eqK$mi$@i~kOpBrJ67QW7?K17*@oyp)_MfT*%nSW z9}XEAAOuMOj#n!uu2Pkdp-LPGE8}A>$;lB4!Lj2~lv&evukn6SVl+&pnd16?vV&ln zDA#KQ)5Wj*lXIu#w1y;@10j%;ncP{lF!$@AU=4$GFVVk*MZA}7qID4Zl<}fKKK1>v zv&L|dsFxh^apcyA7@`vH^zS0Naez1-xi(|kH5Vfo`0R>mu6pwXmeI`RKjVge2ov>C>XlbkW(nWtSWF0yM6ed0`__j<%w7smSU^qmyWBBXKBsXVt7NHS-l4JTdLouj`sFCz8a&m6m;U@&}h1C57 zyobhi>_+_gaupQLx zZZHJo)kMmH(-RG4Fc7{G}(sBqPL)K0K*jj1;mI`gC5$5MgqE8X#4GWlo8g< zdH5atv=4Oekw$B6K>Q&}6*jBeIuk>+FXa4dElI^l7l{py^@)7O~~h zEMw*2+Un4&4cj>DFTAY)N-cB=p9AvWsR$LORQPZwk;J>r zg8sLa!EE6h{WLcH#I9D}`Z2Ayuejp*Z%Nu_NO;J$%K8P2We|zrcm@2@_u!BIvhNPj zFb64$Vd>x1S$S zfpk>^u5{gQEI3QFX$+EP&-opcrlb+-!ybLd9zf^5f1Ly}+tQtz$vuKa06xUU) zN(>`umW^ZGu!0~keZw z;!dCRz53>7_KgG|Lw_3Ah`SLYPdOexy+< zCE1%2zTu{~HFL5`wOO z-5QT!_92&gRL(-Ag2oOqNVCv|Xq^U=@{C>3SVZQ_tZ(Fd)qX|$R7vfLAGFi@6F=k% z?~d+MI=!A-=(zAScH3NZ$XeKv>>A)o#|sC(jSf>C;xr3vj_2*bUacXjUEW zmZkXUwIkP_`bz#C9bh7hGF=^$ECk%(#$jj|?F5n96+-xaygE&JpMwd(JU7CU5GBV=7@}!pLhM&kNF%jZ<)MS4 zKw-)I)3m~pyG|VC>wL&=#|TC$Sq+ZNvlkz=OR%e?G9ldet_PPOuviAfQB5TNfCmeN z>(W3SSgyVuz26FfthLft_;8dXkC8)6tFrOeOFN28Vmt0AP2k#6v^G=hVEZwzueO|zpzvq59WkQY5|MnqNa)^3v`UXxK&avAonOTJ~`eSeOZuKW(xLQeK{n?fN<^QZ$_b^%+_65^I(uH*N6u#lap9=4@ ziCd5L507WOH}N`>s*u&NfrQTr#72AUf~0A<(l)EnU9CP#otgnW2>GOju#K*q=wB)K z2oFuTN1LHNUq0wxSsGB?l)Cc0-bRo+JnEY@c_{K2xN#2Q?a!jQ8s0yS<;NU6K7(Cu zF~Hv^{lZOW5Wsy`k2W8uKjdcRn{dW1B?#NjkPj{XeAL%^aI;g}n^L0kSRhy-Zr7nB zMEpJ_E}CviNyIz6MKrp(P3nnG%(I75k4T;8x$UzuI}v|vE3sM%j&M3opIi|{5L$={ z1tc!9YVH`cezT(lWfCTVCGd;IVKUI#0Xzbu5DD1`RECg~70nGu5NiMkZ{o1L#XI-6 z0dw{_g_&05WEBCs6bWSHJkp62_$csfPC8-J+%mrk!!}m>;V?-PNyR26)Gn)wT_GjJn_nLbj z7V@=#|DP#@>|b~&Fe5h*;_ug1!zC?P4GF>+yX7#Sgr&@^Rp#bMw|~jv^6wXJS)?$E zRrXf#&Fr=Fu#wa+=iC(93jyiE^CcD%OEy%KVe$w4IUWOjVU@>or0yOXb3;xk{<$u@^?>>}?X}Rhd~L z#3rh>XNM#$jUhtmyOB`RWr@h$nqLF{I@-&c=^4cyd@mEB?|#`N-1)L11`u-=NVup< ziCFu05KIfR8~29d?j-8`M_o;%7&P33sxoAjJa5t=*Ov*#RzC>nWrQlR9*K5>Rh+dwwOh z62139g3$bg1j{vru`XL@+wkq4><(o!QTN@<*n9!?)jFAnT&u)Z&(4Ei_n(12M{v}+ zcC#`I4R_R)uGihTX8kNyqxKh`*kl?dg|) zyztAlW-{mJ=RdPupC8p5S$q+9zj#OUj%09``KQz@VfAnO_NIOtOrAmv&`+sVb>h#y zKk6ts7$7I0;gw&0i8(lTzxHD7>Oz0tvXl{g(ZG`LJW&1%o&)b6gS7pio;iIbKEl%qs4YaBU@ zh`(takLmhMqvX4Z?Tks+Xa#{*UE%tLct)pKDblT9M85&XI&djsO~83{ZdtuC`i%w^ zSSydmm($^rE80ti>DowPJ;5+Ph5E-{dyqT8v~d3H$zG%6H4DsqnpJ)aQF>gDT+bFWWZY!|{0i^OcV zAPXQk%&L1Vcl0q7)A^%O&pGx!(0v~Ow9^hLZ4|tlKnAXvfk~5eJ~usyo(;GU?aT)o zsvux@R57yFv~B=uP!0F9?e@}!mHmX%96ltZAGxZI>>V$e-!WL+yy8Eu(XyH#7(FLQ(U19f&0=2h19Bazw zJ$^j*s0?TcFG?bvv&^?1y1AO{@uOhab@jXAkCX0zh;Zecj)JNVezdZ2>~dy__{%tw zDCOkcqyUUNZSCYVoPdIkzD#St-3Qh<#%U%zwJ?mEB5+#|SdxH}smi>l%^eOwQV2@J zCdUl*!7z5uv+`1d>C(jn!|XmW7s(Tk-*qm1-O2&3Bkga;n@Pqx3_RSAVmft%b`2Bh z+>fYcNXHj#VjtnQdd}K+VKG>p%hExUY+-xgIgT!DY%eUZj$9x4YxXJv{arvgj~AuD zOm>OBCwZyCw!`#wHL%NJ`$O`3?bVkneEbwT#6ZaI&k`eccunSKKFtz@A~H>ugrcjc zJdH{_9$v_92cz#O!#u>eXgcjL$EL2TgE2cdD;-X$B%*np5lfwRZS>Z%tE%c7xxO8<`iqm# zp7;0v9k=Df#_V{KFRIqth$ZwLYOQeMkR#>Z3A%T3F-xZvUzlI-bt{lCA4fQlQU?-@A~}WU1A83~V{ViYGJ~ z5(^`svN%+HdQZ|_`~T0S9&P*$di8MIz#%FQUdeY55QDvpURttI+228;a+ z-VyG?<^l$EP`{%x^f*Xnl_14pPa{ozFn^U@YHcwWAI~(s!b{X`U8%n~ZJDXBx#?6s zm=76Xc38tRasPSHD<4h5Xbmxjf#cpWcCWFq!Bomr2ZksV!%nS?e=mEWLt!UQa9n`p zu>x8`O{{pXMq{A{R5SP0W+lVk(+D>G`%I5escR_rTL5#@JAa_@WK#YU8HT%C(mOp* zxJU|chOIHj9_isDd`ADw=hwX5Sg2oThoTabkPX_ECf4kvAJ5&9p+(Ps+in&^WXX_#ho~{?uD+w?w!2B{DqY( zslM1n(n;&m@iE&H$lp=c{tW;({?dfwPec76JI$p^@%X`wO}DQ09@x^xM+ZPO%r|>Q z%@0H=O|^`k9D2^rQ%l#yani;|DZJ07V3jG4e}z*l0me7OlBG3 zC`el47?f@nSB_5?B7-ugR@7mcQ0Ao{ee z>Aur480^-p**L%hm^SkreKQ7dH)9J!wWUz#mJiu>7Hybw3U4mI8Dn3SF8psZc5CqX z!+gA+=4A}YJrc~+lbRjDu5CdqbVrQRX0uO01k8u}f`!)+_4VNy)J7H6Qx~C@(l04|Iu6JK0Gip_#4xX*KItuqj z<}6r|Oysa;LLAtIdb~fM(nFTEx^SAMd+cG$dY9V`*6!PNx^*9#>#u$qzj3$|cKX5{ z9HGj;vOK;f&tv$D+>z1w)r-;f$1;>yc{OfoBaqi%(O)YpYI2)KdVc4>wz|E#V(F%z ze?Kz4JL-l;=l9H1uN~c+EQNbxNbCJ-!3xhp(c&Xtm6BV9g4QKN2|ufb;*>_+WS*_7 zT~=RL7Qecttnv}oY-w;`7$^492lY0_N;N2`dvw2lRcZ8qu{I;};`DAZS_=GU#BTrT zHUlxCctRR%*!$1LQ=u!kGcFjYZ1_(J^=J23XXU`V_(xoww0E6YYCZZi;~-FVLZDTF zKg36DSMcfMToV1l7eU(8Td=7X!Po+?VEv2q{^MEEy7#oAm>w(LCB%?;t zzh)00v=Z&#-b{cs{$dL&yMrPa;=8YI=Fx1z<6I;#-!0)HLo+#^3$zGOWH>~ z{=xdoVlpS;F2IUg&fW|rFcJ>A->UA$N?sn*HxTj38HzvH6Q8^dLbY#9{{9$JX>Y9d z+NYs7YTVDFp*TK-tmlZE9)NfUIdX}@saIOS9Mq|3C21TSA5y9= zUMfe`X)GCL(J}~U!TR=K>L=z29U)vECs5x5{a?`yHSL3rkR|aYmI2HWyQH|_OB+EI zOeh?XYJ?`)HY?muQ%S}yaeobg1VU+)o@8d^DKxDcurG}%TEB7k@x&^3g*T4@Lf-+w zN)!%Z#u^}O1rU?e+B)}|d+!2k1aFKvu_$?|cnMUdXyER8xT_uszS3mbo=oKe)jM6z z>LB1C{}uN#XyUqZE!wYl5Ki-66!;OaQd)7i8D3L%s4acCE27A_TS2zmh3^Cl8o4+4 zvm3a_N-M@mtl!i2@knx1|L)Sa~oE>iMbYz$dCr z5LILEj&8VbUA={^kZqpQ066G8@EX${XXq=G=}A>Rw%R^vF@5oVbSP0v^mj_e`8eE} z407#Oa{ScWAF6SaZ;@dx7vH%rV4=j&YhVe@3+Phow$GMP(FRM1MxHD@O^>1dr)H7` zRGwV5x`Jx$&lEit&GfO^7}6)GFGQgUOuh^<92*?9hHx1HH%3~O#w~c!BEJo@;;;)r zq#~ANJ5H$2O(cm@%PDsGairz$*A6IxXE*{oCx$RX{Vyhz31bf{(o+?L%76nrjL1F7 z3QtcUqlBmaL*QF+jHCo6Z$szs0YIDiQ47OEZ9F7d6R@p(HF_|@7bz!mFS?{#C*DU+ zA{G?RT7nucRuYSu^;-e3rt20W{V>TiF5q7hdLtUz*Xkl$>k=Pa7cs8sf4zj$oI8J}>}D3&A_@104o02{o=aW(%0;`I+ZRDiQfTEG=O zX22hS7(n)8NT%p0OZ$mT!LTu*bP*FP+-s2>UD5#yJ8Nc8ZL)Cu%w5!9qmSx&GJ88z0{W{lJHLm`Rj+$Zo@&R&SeU;uf2{^40#DnQ`e-I^1D(a5lz=1fuF7E>ZUrD!G+c2MTH0eBE?TO zCyrl85v(ua)bnCRjhdvZ8nv^YCT7>*v*W+>aVSm_Y|wOG z)$4-Y4^Dq^7`%F9?HKScp?v3|u0Q=J`tQLeoalGF;$zvlt=liv`LyO{sQbb4o*0AR z9`h`FBjnwc+2^sdQ%-^@H_3S~4h8WDZMe1KImv>@NeJ zQKG?GFK1OLEum7aYEl4SC}BdyR*)wT5W1q1N8edqRy2q(F#5Z;MgWAVI7#zSIgt}! z;cO5TBH-^Fy~g_~w3)urx7COgf8K|BK8zt9=JWjiO?$8(x5K<2^>~Rnw7K$JRVdN0 zsEaA^blyu|=(>r)PCtiqDV?Vo=asu6P_%u zC(VIlR9$rQ0|1-H8x)VZ8pPW$n4)|ODh`hia`7M?dr-4jkZP#nzc5!g{)#%gT;XVa+!H>2W-m-swvj z@udjopJa%sxLK7QOQ0v)rMAVRiBi1M)^goqZL-p_>9)*`W9pjcKSOa@F~|y-pUL^n zqnI`oV%V$JGz2th0F9N;C8+sMAfSn~oTBr^P0DrbyJ0{2c&KDwt4w+PaRk;HpyKWr zQ{7PZ(b9hv+3fM?db=XgJ*nRjPf*Wkb`G53X5#@SDk{tVBNSy z^rAzG$HgZ8q^a?lMqD%{M^PKyE+5wF4yX@_Y5EPX#Z30^%{(gq`a3Vw-t*!Dae=HC zd4hI=dLsHn#EGaA9QWKfv!4l!jjo(vXb&GbGjAma`0%(JYyrcT&XI!@k1N6rpEu;+ zYO#d{^dQc&#wCP@r60C=iK)wm9LDU>yl&W=QvcaZc#m#6xwV*R`E-1W6}`k{YS#`m-Nm$HB#%kKtZ1n%kZ@Vr*LBi3lMTbS9a9jKX1LFyx} zZv^^2yI}KD%CbwknNa4x&p{ErXZwFp}7ZqQh%wCX;Of3ruspoRCri$+=g>Sw| z9&r*muYj-Q4Hu+MB1O$$hxxYp=sQvBv4h*w76Zhk5xe#3F>vo^)^`M36TdT6ae>dk z+lSyyFS)A1n>AV5W8OR8y`MV)po!Mx2XG4 z*%)56XWY2X-puU_Cou90|23wCbt~)~bEd_ZEV_(V4<>(Dqu9PU0ODeVCyQCR*DG14 zcjb*Rz4O2{RHHcY7;PL5%u}9cnoM1OJ|ATdXTn zEshIm9r?HTnQsTdSQnRAVv@7jUykX@`)y6>_k2J`?Xn0G>-939Cg@&1xUv6Lgkns0 z0Cr{Az)#TmN`%t?Vy&r89YgXW5DsHwOK$GhB|X*b|IM%WF4~8r)5{jm!K1wkfWbiM+ zLTs79)kIXD+AavuOQ1Q~z>yRpqj9(64W55ixC-b_S;38x&P>V#>Mt(fz$rn$f?h6Pk(7Wye10Y==TtDf5_fe@Z`31&)H9A zj9a-0+E|DuK!Q+4?g@rjOp9cWEfA`2Z*(bo)4yMRnB6-~nF>~@W=xik{BU3V-zBjl-1BxCJ25ga?$>qcqT^_WJ zmWpgSgwh`{T0JnJC;mCA3kDUKE(L502XTEI`Mu?>m@}-lLd==Xk3MHap%8g~7yZpK z3&fX02wkeKhLy&#?h0aK0jnecJ@-U+2yJ^-) zx*Mf_FOEcyf%42O!H9fm3tklGhsl;Um8OXbUwvX z!&MTam&*FeP2<~$o%X)(WE^=bW2Ir$zqNjATGj22G6FGFdyD&;o(uP?7kj)}$v;#~ z@8erLV$y%_-hg5pe38AMu(d{~??3)0QuVus&1kpB-Mu2lsjHk-|GFJFe_<)>T*HJa zx5put>I_u%i2CWq%TVOa8Gzm{&Mi(}zfe+rl1Av1 z`u`%#QYy!!5gLrprcw@U;K-&iUFGQ2{7`JRLCd0H4m!a_xGTcU{v|UiC4-7;>PNYv zf}f2(oi6{n``;;$bn&`#=4h`MaH#3P@D8%#K&_0!ZxDS5N<* ziVZB`Ro1!gp!rByXE(>yx4w*|A?A;o8D!H@?DRmbv!6zM?2cde;dsNMS@L;;1)R|P z6#c)4OXhPTAY$vbmMsTKtNsi2?2R$z3|;m2-}K%BA!BVYO+Iv9B7HO4G$tK5OMj0K z6KPh0KT5H?cJ37X3hHP(Tk$zAi6u7~JN*t#Ls8hMbzs8*5M43kegkd9V%`#aO&n!V z%R9+=)c{?*{DAc)>P(O*;Aip(4fz!eiqTSUb zua;RFpo}ty;ks1HByY!m6z_BL)ZqnX5$;uQn(enkbcp zQ^4u3+&g9IrYWm95&Wk!xgAGZpk;{16nc9V{W;*Z&Zw99P*b3xqp>l!jD-a^{{ z(jb*7`v<5`Gd&|3RQ$K`A(wdAuQ%KN{4u!ZUqTSJ@Vi4J#HLF9$g7ojV?ROX?$#{= zJ!wt)dHoY(Y%7yWnCkH!p?GNc%mdnX7?L1DOQ`xV2b-CJcVwKwS7)i;?V0R)5V9q@ z0Cy}_ccZ-7EVDzgclxDzlL=C+@vh~u80;!5-1(lzqvD6Y4-nJ73e83yW;WphNB5vP zzkO6pujFtf464qFOB<2fnnBjTl>M+_*#a7^v%wHm1WkIuvwtdf^4B#{d`N_{4$m$J zjN~3AP=6_M*8HKsiYQH!zpbvxma}P}I=FB;(M}C((amWF)NURMIftu>H3n<)kBCp- z)psI!zz%)`dT~(V?7~Po6RJ;=aRX?6C&#YK=NSsOeIQO1xVnsjD)yNxEk+FEw99M^ zwY~>*-NbHF+%OMyN(<8YVMQ8FJL)$6ko6gbThYBOoQKoJ>4tc>evvyCcWmf@em$#< zoubLLEwJR`g;MI%7#&kT`;KhYwfxX3&=ke}8Ke#)jPjAQX7N+3%T}wr1aF~RuJR6= zIZ4W?04BjYrUxB$6~xqYV7RQyTWU*7TDGizdWLN?QdqdZgzPgEJid%NfKB=0C(1PH z4)6U=|JPr(Ty%Jjn+MB_To$p?i zo^j(OGWtS-M~wA1Q1$9zdM(#X-j8iD6-sXc7I0XYl~u9ld_&YJ%-;T38YJD9Ik71~DK>F>8~N{YcI8f<(( ztSP~1-x1jm&hbS>V=YLdVKbgT%p`57cD|Lmj!+>Uj2$&Lo-OmfsI?@UCKJK%ENp8X z(LHjAiK@v}_bS;=jY%^ZcECZSlNnOGiS0jP7=!Sz@&#O1>j)(sVC2pzcilo#VtnY; z&IfNb4{icARZBnKk-JUj$pS8+>`k8LB4KwJZLnO_3JlyqA(Rnf`M5f#>N&#F#a$0!MBH)cQ<5=gpLQ2b_d}VCBYsUl?1kEs(<4}j6#yNnhdxpx&F{#LQtT$ZaW~{y z9d4O=!&h0)3Af6`f)dfOQ!JmoPuXdr@gm$%S{Q*e0-{@h793>hC>*n&xG`aW^51m# z&f<%Mrhp4+E-CL$6#bj;Bl}sr?M?suI>w`KlbuAM*GAN=ux1baj07eH9yJtLyZ02> z+J{?ScQ(PU*$;pYt=0&cImG%g2b8f?$C7rHcfBLh;IsWkG z0;zwt;^dB%ZM$x>!iv@97su{k#O|^HzkHz)+M}tbOiF75veJf+CdesYDH%B^NT+C0ZfZJ5`x_3VQRZ zIn$U4XsQ(M25w=WBe9i@N)efJ18MMdD`vgdwLZ>kX?9B0#~))c#HG;; z)h4l&eAc4daEbbBm@sR|#~p-x&v(@v)#6pdr22vHG`P`=T;n-L^ZFANRH@Gpc8Sy= z@YJ#;V*i}LdU&Iuz?o@#Zs z+qw(6^Fp0`0o`SrUD(v$uBO2{E+1?VFYFZ3CT?+xT(-UM?J^NhK7_rxH_VdqRDBql zAaM?|#K5WRaB3haso?A!LGzUmZk;;_<)d>B<++PWupV-nU_~0iqg&Wo0ye)L7kRc; z)V5st>acBjMd19<0{4N%K*+cCorgSUyO8G_rcWOj_msd=K~3Vt>)VuKTyR3HS#8=*E*fCZv-?N z{Rl>cl20J)Z$p4#iw|qOP=Itu`F$UR;RK+BT_R3;Ou+A&bn{u>T_ISr*ceMDiT zB{pfa!>Jr*(3ww968O;V!t~JroG(JA3AOQLGfcJuBgERXsx%m~6uOh({Rtd6F$RV=@gj7?{^x(+3E12Er?jruxb>mHcjK#~Pl)g9R%6dp_^>KdlX}36uyzHH_Lulz zj)Gy#sIpz-*2JytXd2;I*6zs5^uo!e@8&&YnNmlMrr zZL??o-o#?aq=qD0V!Dz3MER~B>lYkyDTfUTL`6I&X=-p0J|=;BpSd-D@B{wVC@^~V z*cgkC4TK^|I5$>2ApVSw`hC(o$}I65K6+USaxrfon^5J!j-8zC^QU+l?ZiTE&lc(Y z{nFL_3BQ^h@fF=*?kcjvP&HXWN=4RO%xZQbRsBW#`;J-e{Ja0$X8*#eRo$aAOyg^W z=j$Dai<%Y<=_TCS1n#XntSLjYHDkl%&EaYn?&aCtg>Kc3%n&kX%ZoOLZpppH#uQfT z{RNShldktuD(}`j+aCA)G2&TS=J~=cv(VptHJ~P7#g`mChKq-sh0P7GO>*}ndD+6g z9{_dqF`~Dk5knY-OSiDqOmAt~a-h3-D|CW3-B}=>hKD!V!-E>6WIoE` zWu1q*BzXZlpc2VlII-aEeY9~+C)!OK@Hs|g44e+PRw@)Ec0OIc$Lg|!Ay-9OPIHmG zZLc;K#P~fm{KO{p?M7vAXUOi?`_PIEM%wRqX0V~lp)U@HI5!;oy=c5ze(;;g1R-;I z^X#(*3E>d+zXN8jp}*y}^*En=(W@Fou31JJ=H{b>eZ7U%#&lU0k5-g9fl;fShQ|(! z&k-6>(%WUS9zKc9{9e^vNAv{>+#!1(LS*H{2whE%E0b~01P(yQ9us-8MR6%KZ$ z+lp4?H?))vCz2ACTgzjhbO?k+kFft0xb^u1UTjdiYw6H%)%ib-uK(nM+E{%=WPT@iFS?x0i!^p~ z^}HC#M!Z!$xrkMN2d2&={Z{v_O{LX(EVY??Wvj{3-`YG13imDx9%9f z#Uezq=+E9zYyq>IDYg%6JCFot*oxGasx)KI0H`0H2d3~Q57J#Ijq!zglI-+(L1k`q z7pn1x)!hD{{n&&zyLZSQ;lkyRH=K_|qF21wY}vf4H2Hk|JZd7*Di=-T&S!}pEj98M z5Tw$TJ7;NAJbDE5wZC1uM3kO!)3#577tO7Y>#md4?oKh=4g#0JcENJtqF8xi`X^9;OZkU$*UeycB-&I4z{#gV2E)k&6x6ynuNc1ZHnHf1E+PXr9YVaq{eF z&sL@xORBojkeS3jiChme!>mDbo?8f}AmN9FOtc5~O7?R>KLLN%(1cRvBgX6V3TRw zvss?>9oFAI57o3zS6ZsO@&vI5U z8Ud(jQJjNd#FT3F6v0*$97U0*1X}YST5jy~5`C4-$EC<%LRStnp%@`N1(2L z(^0(kZO__`wNh%ylakKcYL1-qd|#|(ge&LW9>Qu4zaOiXzZCFtWrZBjz)y}1w+TK3 z63=K?uKD?|YFm3~kJ#Nk+6>yx*#Fb;Pl8IHOAHyTGn?!Nj)y5h5u4-!&L;xw#^^X4 z5))nVlI%Rh{Lqc2OdA9By}x`~VG?T*X{!=E9(^`sSg#515j6xEPW^RU*R_tLI$t|d zQlrcwcXK4oN%YxB1j!@f-6=bEYxo4f%!T>8J6*~yPe#pt12W#mrq`v#VUVWm%Co(A zcIGhnG@FbgU?|x~tomW(0pWL=YKdMJD9#4K`*2)pj9S3w&C*qVHlJif}9$sCVHOk01A$kef((QBsH zUxCjseU#=tM&sVoIXEY#s$YFcCn+%gc~yan8|+ib%G-vn-OHi3v#rHP zzDgMl?1;Y+*ugng@@0H~#AztR%$2u3WsC#!8y1u|JDpKG@j7Ysq!j#az18U_u*{%q=RXfcl)q*msy&1|9s!3OD|*R zb^)3iO6gT^KNnxLj&g-ZFKhMX4%p>(7c_vG@UaJeImvTwbd?L#{Bnn7S%3NBv-sIDUmGLWavqKcMnml9&2(c zeREf^&4RZFckp52YPSZ7z?h9mW~jT?I{bI{;m!C*8eck`lQf#~G>hG@R#0lVc*^{3 zNBKYAH{CaM1CF*S?;X)AEYGFS^u#(L3aU?00;^xc!A7qOnV zQR_{!&%stmlHt9!c+V~#p?SyVvCbS5X3=Ymgz}Wnxc2h>E8GYhAlVP^4b~5G%~|o(CDnSM$Ir%#bjb+2y zy7Qp(SWf{O;X#f+)4L6XHfwv|Og$q*Ow1=>D{r$t4nQ}V0SA;Ad^7#e2TG>sQ^WjT zuT(7|%D}W#sQWXs7H(~rD{r`E$zR9Oq8DB1B~98LN#GK6+V}* zEPscGQeD)wLI{d>*Pb-Nbc3G_jWLiRfr|7t!A{QJO1(4mGhgr**&sniH>^rR64P)p z-Q+;8%}YvyP;I$2_hEw}xMkQ=_=uU{#gQ#QKcAdYK_mn&AJg%^D@=~P+JQOAhxD@j z^qP<~W{jGc_tlseBWANt zO62aul^MzXnM-k4`Gg(GAoiXSzA5)^YZrD$>~vWZkhZ5o0SAz=eM9i*w$zmrdv@_e z;(2I-_cS#&5S;bNJ!6JF5l3bn{8V&u30)?9i$oEbH3E~tFc!j?iIbdX{?&Dj*0W5v z0G~v262!C<7mXCnivKCwKJ%WZBPDa;0~YKXLxwnFdRMG5 z@V~TE8<)qfC0XJU&x*4~-`Ov_gv{YPE&9-vV?|#p#%t<76D#%Dg4kO1S6Ag%MGQ|8 zm8KS_pMIat$Hi zBfR5c5(}pf`NOITBw|xs6{xj(RcA*sNU8vHc)W*>i6&?mX%&9K1e(^tQ5ygJ^N~dwt!;uWnf}e}R zIIe|Y@E>Ew|EIXE#Nz-E6=8QJ$_e9u`N6UJlhn`NzmYqRZ$ZfjJ5lV#TqDIGbOsAi z$~EGF_-zL<%DZcAN}<+`UfD6lI{Q3|1d>O+JTma8lMfw`P#kqK}#u6XooD{$+3U>rGR{>v86wjk{k z|KT5NE!rd;T6C3Cy3Rw>Z|z?c=SPOKK=Mx7>bm>~%*>iHGxDBqTpq`7OcHtvx+goP zT#_sPTzG+;c1svXJ>9CK2(T9Y@?VO>)Z4Q(+7o(h1sm8wu5@N_la~%fG<1|h^fsmB z!;sj|sVpRxUM!~RHc)##@?Dn|U?N=WxS<}68scr)5NlyO51R?#BBWMbfb)8>K7g{~ z*+v_l2)TmiKwI>lo66W;&ihX}^cMlwC%C{3?IdEZ#`s0AvV82$^JbH3K4Kg>l=1%9 zLQnWda3)xR`QMF={}%X%+VyJ`YixYAcf`Q;7yh-+9fmId1vBklRy6%Fv=C#$IV`P1 zDePlGak$8;w0@rGQxa+pm)hv(v?aE+&pzE)y06g@YLxvt`xlQ~^p`77u+BzVP9n)n zvHZ?h5i?11u$<2@9)hgH?Vayat*f~H2-_iPvU?lO?6!gw3xN}WvjeIOB95^@4T>r1 zclNUt=!Dbdq&y{Bk8%<7jo+`II23mzL~T0r$oA0lGv zU-jkBS+>LC zSI+LuGa!+RuVbDOWB z1`&4l)=;5QV(6S=Z!eV`9#9gV=$5%5U5rYb!<}eJwBa8!le0^fLgm=`^mIjcH$za_V=Y^=m5HsJUPYN zCVBtJk|V=24i?7WSbyLv1xUn{#N8blNw+$`_$`-HLaDsLl2&*u)`hp>Z5iKN@GsCT z#g}6D(^)kNPqApkd&PtYT)*PO#OYws)@^q8aVLZx$?4t5&EuI_7`2dvSmZ{VbGv9= z50qh+rV@zw$VRx89Y?;m_1>fiK{^UzqX68HnD)>Z5V>WUQUBHrVNbPrU>j?Mhpd0+ zPzJqlRz5WHHp?MIi)uC-wT0s8FEjmNjoiUN;=5GMtTeRFb=VyL@T1U~1r`=FORRb; zNJ&rWU9z&1lypvk<_qd)!LVnjgVQ*MzbZ*z?2wel^=}`yT+w$d%A4eMu#gu% z{V+YpWkUXLd~xELb9ZAT)U2m%-_PiKJxN~H5D523PF7_2p4t`q_3(A3c6X0^|4wLu z$K|jzv(l>7D~2A1$Ly|BluVRRzrUH+)l=LOQ6mbdq&bvL64?TQ2Cts!#+Q*Nk+7Q^ z7EyTuzpF{Qc8OOpg*@!E5r_e>GNl2vrgciyos7UW^K}H5rnMl(8L>=94TioY3@;pn+@jZf7hn zCQI;$l^A$>KA5`#AFcl;mDo+c&`dw!8m%9mr&dPRi4x1rcs_WN%{n#b>Ok*D02+&&y{be)`!y59)bkbo_%n}i7w`jp&g{6`+7V02A=gnC zMsY^UH;N_8$P`A$gYKUNug;G}?0sbqH-FJas>;=?&0}z<3CA)m@1&ms1=PL_&Rlu! z$l2EO{Xd=?qdQ-gPXTIQh36*Ueb;B~w&n(y`)&+nZHtankBUkhOl0UgU*64Z?qMf# z1)li%)=vBp)$zf$aR+Ay4DraC#)gS&gN#^56d;L6+l6lQz<5`8N)lP_o~2+Gug z{Xk>rLYoP4-sKgq?`l5VbY(9>>JTAJ?M{Y@I#$F*^y`8>TtI;{1QTR?e3j*$49 z_GIW6@Qm3@&R|9{+FW`JyOQK+E{0O{>CjY>29bK5xKyJ@wxfVvqHUESL)x4UZTu8O zDC8iBKy1YeQU|BE%Je%(%x5qoD#0)qf#{w3Sz@Ur#Yu-2mo8y(N@m^y$wu;wRe)6c zjro+4@rOTnkB%vQ9fjeJjFtZbzcx#nq&voM1dDwf>D|5N^;q`el)sQ@{7g?JY9{pW zI?V!X0q-t~-7Ttb6HV3Y5lyWe@V`7inBMa()GueiPt;pcRNMNBNwB?#8SaJ|jKpEn zhK3en)v;66pJC^Ab=ydcFe>+Zntgr1ORqO<-Skri?Qa^39^jL-d+2p%w|}_3 ziJ%<8H~D5Z%lka&NPBj>Phw|%9KmQA=O=Irb^e@PF2=^wUwnkfsp6#B=%H82x&J%8 z$LAfgmvfjWP5@yK{#;ES|6V)|++AJ%` zBOPN#Kkp!%fdyCSHYwtbmjPxXccu|4(Ygdk*v%YDuw7p3dsNH$JYV2Ajh`%jTRGLT zd^Q$>mI{L#i8GNW)KSN;I$mFB;4Zv8r|O6rnI!)cDf@crz#Y>p!#!oMA7*W>$Sv@h zNBwP=Pfev?O@%1yc-Y^CpmsZ>l=ri}$oAzxM(>L7ej#G>;VrU&Bc7jwF zo;XOaGah2*U;}={uwW_)fQ76>FZwjg;Qt-YG)ud>I3inPI9-u0-mYfG;hq6Kn}?f- zhuAgTNC#kv5F{mL#GOfj8X;)>pMs0RxqqoYg9;mU2>jGe-ycAR)A1wrRy$9PiUNku zLGNW*i>-@xYs87?p&U@qaxeZ(^{dQIHee*R?Wu-g$t0_##z~mb3k+; z!@EeVUA8%R5<$junc&Lud+j<_dmR|JuIz?u(HN{K*t@94&)Z^zm+%)e<@OJC93>8Q zII$P>`|)M3QjJ<0tTZQxwwm-2*zU-K%Djy}rR-Ua@Xdp~=&H z**Vjd9axuCpz`a%da;SQVY)m;iv|?j1szo`z#2#=Xvq(M zyvTl8L5@4mf%zP>RxWrn`0NU-C8Yntl>zqRtFcb8%I^)ldGFhH1Ay*;u>tYF6GlZN zIa4`WUt~$#*GynK_j)Azniqc!t9-%s10GAhb?me!vp)H%Ty0$Dk#@`=2kX*h#2)%W zl`9h@YXW&smF4Dn%LpWT_87dF|14zV57)o?Ipd%A#{?2{Q#gdfSG#4Kad6%goQQht z>_EUIC$1}g(ny(&9AY4CQ>+?f zCkz?a`M|M2CQGne}TXKU)oW=jwN8Z^z(13u1dG#&nDeYsI|w|c&4 zCugjILf!z9uce=@WgTYFOpifK3-Wr#Bvx$Xs+P4FSBO@aYrA(BG)4vlo_xFyIM<8yE_WC*X>8gkw=PCufXB*WjmkN{o_vg0U+`uQ zw5Hy04ijr&eqhU<1;}Oh@HUGO?AotgEapr&k4FRrvf!ElOHe-WtkN+Xp0Fsn5E-5q zt9HP;<$c+{^-inINy27hvgpsOXeLkN{!Fp{TBcha`d)k_>`RgpZh*WKb*sd%!?x16 zzR%4GR0~wxCp+ENCDJ&a^CI20Uxrw(Uy!l9a_0!5Xz9&_`8xjlX z$?@pipU3CryIta8;%2E)TCN-B7g;@YaceYTW#eAK?y80HH zMjh$*z<-N{Y(%NHB1Bu2bOE=#m3A2>db^o|D~EPrw<1~|Mf^SON<~xW>3out*O1vD zT~(}pNv$2oE$rUsVckL#pU!$ShcQW0Okri<9mx}sW=$$sO9UTb>aGqhP{&%3aBc!F zT*VwVCdn}NjMyH4FVFHXq32{Yi79sEokCvKrZUbQ7JCcX6J;ck_p!JG8CWhxf@-gz z)>5$&%w7H^_rFn`eV~lm|10Ub1EKKW{~bq1hm+CScYKI6$jo+EB$O5+;|OOfIb@x4 zj>@WR85cO`n~)9{E_~=df)qbKhN`8IN@TrYs3iWaM95Wth!q^ zaX@deFdCF$B8O=8yx6DsGF-DsKg?7XQN;M(KI-ZD9Tt%w+ z21?6&22S$VATvtE%~`YVo;o%m8(Z)6eBwCpS*&2A>XqM`PyiQCndb(ezz4ogVfUx) z>XhY3ct4-F`L<;KNF=AopVjwm#mb?cZ;!_DbC2(Tqo4Y-@Wm{?7=@k4J?~a@@0|{9 z+5M;y<}QWvGQC1aQGUE-W%paI|KQv<^j(5TyV7F(k(J4YDuNGtJPS9{;*tbpJl^K$ zoMYeDsT7FKD<}T;f^UCCRsxJZw1+spN_i4-v@W$~T0h$mj#X^fEgc;sKlG0-fYv1a zc2G>Up9^(8`SQ5d)!IY}l)bsLMr!sPW*>Ky27P+1DX-)NFAw5$WW9+PBL|f`A0CD2 zJL<_hQRs*|!D5nT>jSN}gUg2`^!w*<^i5~pMsh?IiK4<#6YD4o_zg$^*@SrqE3p98 zi6J{dh5vJ6KM$MuNB{^mBvL*PVy+MATSeVeZdAPcnwy;2B>mt$dWVZL@mi(`!wOes z1xtl8U38v%p%Z*vBpWCt@xAaMo+!XuaJcyv8N7FBN-vC-zo0OE?M-XkFhio7(?P;m zs1%(1!inJ`Z??vDnYvs@KY1Y2jwJfs@?13WrCK03f*)Iti$h{CJ1ugQW5ES;{)lgo zYXAJ)Z`HZq4X3)Mw#>*c?VM84jZVcnwW58HqmY-o?v8Un8&(HzI1O^OSatqRKZ0aA zht+qoZi^bP_5?iBs`T(J12lpkX)i20e~(m`;ReH8s|2tm%{@mtd>fr=QubeQz`YTk zme?#^^%Kb4l~)EBBk0XYenq&~Lo*bqMP+zPrL!;1i5Xktim=gq=EqS^>c0MGysuC~ z%yLp8&^ScI-sf|6DkO5ah(W7*JesT7Zagf#tg<)fx+iC&gIaRL)%8!q==V0ncqL|A zkXoNsOWm$yPf%t1)*QR$2RYV;f;lAGA(*@R}0L zT0qaAxr0Z{K|4O&b>|>c%8~v4M;Dxhzq*DoPZftf%+u0CN_4_>zJ3vHxN%@H(aHwY zzbrA_5Fg$@DVCwOL0f~C>(}zi>d*e>W)pdo+LV3mg~&|=3$_ZMJ8P`4>ld$!K$bm3 zSQdL~LlBnCRMhj}4$qgnj7IlCf$FEZ(fY5nB@iLHsKd2KWedVg*Zy5g5%YYXb=e<#j3>!8ctsg(1S?N=-Pl`shOWJwW?qi9_QKOe*cJr>3W(6UPwubj5NEe zYxz^kedJrj;#D!Z*7Oh?9Ia-g8XbYW8aKXI2`MkEg=caMjkla;dMxUFsWs){cJeL< z6Wfvidt}-2^QR|Ya&yBw;n(H49XJ(3oS-5h5t*bJEcF=Nh*Rdm`@xKJhPfXUG)4fZVSR-w;q4xo!q zSl+CXwOmkXKee6aV7k+G?wZE^z|#$9xoB@7e~Lp{cxA=saLaoKTufYVV0M(L@YRQQ zglMgMxbOX(KKjl>2<-ST>WGJ@oOx`bU>Sl>dr*0o2-svZh4G3IL1EmYFiI(mO$sBL z!XW)3MC=}1lt9Rq(1kU>3PYU60yaF(7_!@VLK4OEFe_jerCW&57J@ioN~W%|URj-o z>P{S4f$4_Ic>-NkYo~I39IRei65=9y+t59(lR5aw8@@Bk-{tT0W>lPbx9u=4rZyhr zJyDI7txgz19E#7@b{~pV z)#7@wAyj_)Zc3GXmy{l|u*T%9S^aS>!&-hEd;&&S#9j_%%!oG1`WT%=i3X%cUA|gQ8zRkpROnZAm`ivSnf3Dm ztk9Xadb)T{&>{`ePa9*JXQ&%0}|D#25glf}*J3z$d*lJbptn+{8~Qtqu>zRTyf zpLZFKn0daKIdiF>efDy8*Y6ME=U31$oe$nIh*FKaOklsQjw|mEZ=dE>#dd92ck{o*3L)Ta9 zRx>2!DcQ5FNY2#Nw?g}Y={O!(u;Iru=5;61u10%dSPGK*T3Sy$IQ16!6UBaiEv0(a z9Fq0~>B7#@c_Hm?-8Q$I@_CXxbxSiVijHQd3JxFJZC9*EE+QkA&VH&gc!z4_va*~Z z(f$oxS5MWSK>w7U6wLOudj&Za-oXUO9}_HyY-MSiPjlh@5H7e22{R#tW<#x6*mBay z`UO_b5=Iti0FO$*jE^e9gX6j1XY-r4Le{7#b_;YLGpOhP7SGX8UH34-k_KSN1Nwnd z?sLIy_){*HG-pcwb&2o5)_O-r2opIi(Ou}cgG|LJca^XpDnztWOBzqC5&gz)6cPQN zdPXGe5&byuextoamx#q)&Y9h?eRIi@Mqu1u<4k=_6HmT-%6>rCjN}AG+5 zF*Ax52kBdBq(G?yyT4| z)}D-hKdhn#%cS{;uu?L$>sgX{|`U@0Y zo{iG4QQBs;RX^lr%^ah*Fe7n{Kq{V78?NiK=NY)DR)a4v6vE%;t>vW`>6wF2V@R(Y z<@o!KF<;#%yeBuWTPgv1`C5igS+` zL9X)(GNL8tHc<_+Dz$SzNJ(VE)2NoLU#=d(>=SzQjtEP%u1dYKt^u@`iF}^&N5}eN z98~xuMDKLm{gap-dB8zZp|LPEsJVpt?B<*3A$=b`-PF+q(Is_f2!QX7Wyb#^^p4-k z<)!CvC+g%ygI=x8ueStSony>?Rk?_UB$moO)1|MXHg#tM9H)c^rz=%POQ<*xy(#=< zy#lVPH=9Qe9%gyVR>E}e$cvXEGt}>~;LQ8jThDy{D_-YAi_(DtNLEEthZHUIm|Zzv z?sD$O!7d5%a{6uWX`~CU!odLq(+BTaHe`nPbaYqWf=675#gu4kPt%X2{?gV+RC~|X z{=QZB&(cD3rRLzB%Jx^Rs!vEwUF>L?{vZk-fgfX%ZJO#AqP#-?9^f?_hmVRODSSMT zI~_o_JOy?D`IFmB;&SoZ4$>~TrXkD_M(>qa^@y!>o7~A91dOMhHifb!A-&4k6i zJ&tgIrP{(rybjv*%n0G4^?{3AnLjQpd&3SYZR?R7a^Z!!5Jp5S1bfj0dI6;ahNoAj zP4s9mG$xXN=gmi-Uf4YSp)G;@sZU)mjtM4o9}m-)sA-gC{;t6sAx$^aTeZE4~tpd`SKX(}46!LRc<^Asa zl*d>mJ85(pHcm7nuUvxgE@%V`{vEu~u59qwmW|@OqfwcWiZlG_sN8KczyEK+%bVVRhqBBQd7I_V+(MjP zpQpZRD@;wrbK^Wh_XW*jX-CfLcTAd5;84PM;2)~v=Zruhn%;0HGWwEA$IX(1yzn(nx|oZdQnUnKVBpe+v~GkqPt6oiA62$^;ECU#}s`1IlKk=Fv+;(tZZO(AeO z%7)mHBn=sLH=Kl#^0z?GCc~xqx|GEXi%-Rowro_=2NIs$CRHjnGoQ=ubf>artkvL^ zZlpV9Su+#ai{gFqW%XVB_}Sg>c5kG=mMe-SFg0>nTi*Z$WLWLE1rXWrpBLj&8A>;v6G0k4%I!W* zZ)77i zgv#9t?XPj*2GvPW>QYh~Pec#>)o&hYq)Z4O3XIp}$fo^d7#1`uOT+b`aat^JA$$1K zb8y)fiONxlM1zZZ@va|WzP4n^|uFSzJw!vZa$7yjAG1`t2oCn7~B~rk#Hh)(E(QT84Zpl1PYCT6n z(4Gj=u*qe*<8Y;i9oJan?!PRn$Ct5uwLpIYo8Nz^DN(aiLONm^YQoL}Gh=;$}aqr^=igqwfsuKUi1yOU{^BqlJ&R`@pw-84$@ z;^+Q*&+E&7v-y5ne=8WLaIpw$F8dojyv?WG!iG9j!bjq^TkjNO_Ppu~D`7Z+ z=#!K(j;#SWR2(OL`dI<wDGlO zI{^C~MSFC0huAA=ojmnRZGOB+EeiLWD1AO`%L;>udQAaF)rJB>@$IYZ)Vk#9VMdO! zuPB}XW(U|L9|hx?n<9nQ11(9@jah#QW8e=V43aG$+cMe4SPKTWwKleP?!MDMi|wQi zXE+DbeuZx{6ht5KLlu#^n0=Ibom8YNv>^k%0eQ(G&XvEETUWBLh7T*LZmwOWVcOkg z#3Lv6`aFmpZI1q$JA;4V*y&b#>-*UULs>O5L-y}jux?QX*9vz-IOzSHpUZciy?&t{ za$Q64N57fI$CSSk%-ZAg83QIdg}fKg0Q#xV5#dKGqV89%?<7D_t;{I&e$6`k&3d0h zAdC6FHG|3VV&~=Ty0N<8SZc6lYoHZKr!&8Znp_FGwdIsFNw|1xE6Hr`AztYdHtJIB zro{D@6}@Qv!n4tGUsk{T2+r?vlwRJf426uKr%akn(y}tDr9h`)m^!hDk=&7lkKJaXF%c9>8O9#rgwO$DAll~SYvI*x zt318iuYbk)jE-M>(~L*&K6A>UWd8h}*aBKE8(NO@M?3@yzgMn#pwagIlULx&>xZ7Y zgbr>dx`J3crsUHb^}l1(m37VK{994x>|me_IUQwWD2UI*oHDqI){8EL*b3^HuL(3d zHW;pX)S7nvm^It&UzwM?lHeG*9-(S|Eg^^`x9{yj6|1fuioNs>xSmo8;ZY2Z^VDk+ z3oK2%>Z~3l|3&Rs`c&`!-dYC-@Ui@@dQ*soMMdki1?=@cf=t-56e_DfvIE?mOS>ox zNW9@7XRg6dQc#c9%u5i!8Fmv{gU!>IF5$C)^EHN~4DjkE$6k`fo4ZjT<`=phk&#Gt zOO+9d{pwE-RD6rvQWX6F18)pzP9Cucj)X;b$I$lDE?=nMVR0?+!b>vV0(YjGf6=S5 zq%o8xLiAFHMdHnz%hRIllCkD)WT++=`W*gH>WU9)y8h6nbOs*RF2G>pa~~ z+~KCUwuGC$l)G~TeDZPYmt1_TBM*lR0sF)h1e*-|v1kRUsJ3QnSqgYx=z3)Z)#jiSShC{C9M5eohUAQPAjGYI4C0=OyzN9&J#G22M~XH1vy8-YCEZI1KQ z8#c~^aZsMztel*kBz61fdlFg@e~FEx+|gHUs${2*SsnpxSMk|WdDtr$WZX(%*KN$8?-Fxxr&-_Bcf%{a5c2?})^qui;gIgx5Y-;-r;s0^y766=R^1EC3_~n>4bl?ptSAttKUQzt2dqQ zJw}~?vXN$>pP@cJ;m+KpgL{bz(dgRlEG0UbP4<n_6^QySdD|bT`ez8|wa!2F=H#>3#>tjBs9udU z+U#c{(J+&j8}`n@IjHzk7EE}XV@lWt_w=i5WcH*WcR}lzjM}Za^d~p(jUBxEy&`C% zZy3nML<(iFs8T%ja$vLt@#aWH&+r7fQyln#B<0AT$-$;<+QY08@TW!h@~*Ri-#qxxi5-}4Nr8d9 zqvsq7Td0e_)bI~7kSKP_r4oGZF-mO92RTJtbEisU<}r#BH${6LoJhv{gKo~u?SJ*_ zzRQu)#($S#kfTT4SbZUmsQT>_&K9+#@YXlpAPo;fH0ulDSvqDhHjgJR#Do@*09%bX zF{___|8%Sl;ol;<50>=PfPq`OvR3~#eQ={CjK(&32h)d`{lp&pt!g?CX3eZ!JyvcN zSM9Xghr&M8ba6B!{*++CcqXof&_W!eybsPSV2&TCT>Vq0($?G_6qpm?<-y5_J8tc3 zv#GA9q*6CPhvXW_fA3MJToZZ^!Fzs?6Ry#b2<)g}ny7-}UvWF#Zr@yy_e)^fdAm;8 z7R7NfmTgSZ51_g`5vZru|4Cdg!Gas%6cTL;N3hYk1mJsQJo_Dg4Qj3cyPp<+!=Zst zuU;NJRSFfY({;#O-=G9-$YZg9=|dVUu;5v7zsucFr%%cXEqu@2GSwwahc~VUA8`&Z z1vZKA1x$f59R9Zy0%m7YXRQ7~bU7a`w6Fpg^KuOcA?j`u!Vgj5&7C^tgm6~S3$O$S z27R|rR>rjyYSLF`MH`DV+f}+(hVX<4kzP*qqIbE(>*@^srx3U@Bf7*KC zgOG92`}^o>>sXsW>AhdZtAq`DfT{X~)XtZL8)u*L6Of9#?&t-XuBS(Jc09u4 z@*fM4TUwTP6~-ZLd*Tlry7&noK<&}3{MV+RCAz=8EvhSjd2-LtB|OC2M??Ieuvrdj zqS6kh$~R{#{-Ed!qY4K^wg-Ulbg$0G9Y@d2DW58ekdxa)eP z<}i0*hUoZB-D17Z$e*7~i{TdVY*STC9aLpWna6(MCbTh^eX6T_IRCtRIO1ifi6srY z!%?DJ<*jIIEPqG-(h&q7=4WjT5_ojUVPebRTtWRFosOBQuGNSHogxUjE;vE zZ##rZ<9;rDqqdD^f|QRJpR}u-4-efG9e8J$CAiiL4wCl9zk67(xG1+cDTdcB>2>-1 zXQkim(-ion(7(VD7eqB-?Fdp5Qrs?eLt7pB{-r0R>@KNpXregO+d6xE&u6!yE#b)e z%@)Y-UmS{i4?b-Cn#&j8>@Svzv+%Ezy_N_?=qK$3(aH95CT-B-#CS ziI~5Ku#d78AZgAF#IZ+rerh0PF{yrrsOCtiKf1rxnYs|Kg)z5$jK)Rc)+LeP+NvFI z$#Iqt?nk2@!d~(Hj5g`%H{ChQj;}AQm=(!krJqgnq4R=L}SNpjUI6<0tp?dE*_ zQsiaOgOwphbiG%u4cIG1C`4L;+g;qniu3;po5wxv!S0{=U%ww zTou6*FZNca`-@&HKXB@B8%faAPq|(!n-(Kv+Q0bK@rSRIw;<7JUC`I*Xli9~c>Kk- z(ZSD>d&Ry{-$w%UotB=K1{629RsC8Y9mIYmCyoy8|I{3;&ea6;I470G+=VaJZX-Cq zi8owpHzR*-2Eem4DP0+E=d3bc&wH2pXMB*+t1U}9v|{_|e?Km`_s(v`Xw^d7!ftdx zkr*OfOlf)eXGt!S{~VwDQ{5&dk8p=psp}&r{}ax-ib441T!W9_y2Nhr%-g7Y`x=5I zi987eFCFV2;#AsAWUKSkJi`Z6yNq^*f?3R{;ryp0vsw#FLP#g zkl5jWqR;JrenrZHm$%G?p?VlgvO}b5(^*r z)+}gONhWEGDKh$H8}g(5b%6vT3=wh>mGSou_;O{55HG2}II~!&T_6IK=7q()Ajpq* zu~1gX7#Y)b?TuX|G1+bo>=E+Z3jlX37xL zy_r+v8K*t9=UjZt<5ES=9o{L~&Dy&-&%do7?UQe_&e~s4I<)C(v;4>BgZF`Q-Q*v4 z%f&y7=D%V*EEj8uL1Q?wt}S?y~BOrhl>nC*MSM5ng)1zq-#F))>eaDrrR-eZaP^;YN_}{^8o8Z5xOo8D$rk~-;euzbLMR#)aE=LI% zH~JaHMUHup)QubacWVmZj4FXsK{aE1AKxL}Luq_=8ozCXkgI#LRMq-SFrHTMeQil` zsW=$AbxR<_#!nIC-4;H!z-x)KP!gWwPosr%-ebBm5Jy0cWZwWqFdjSwpiP=>n$=(*e2X1$>EkRII^bZc3qbq!ED^!J^x0 z2G(t$cj#rEGL;7O!3$QhHxcW`3f-*hrUR4xY>U(s(<^GC&4immc+}IAR4_`rhdXIt zkQoigGVlnFAWqDn4x^C!=UGsP&*U^_Q?9gt#cB8mXXf(vGbtk}R?5v~xH_V0wt^6; z6h}ucdL@e`P>GQdYkwRg;goL9C-&DKO*q-<(;T2g2l&eadGh`kAM!l}o$Z9YyMGL} ztZW9%7S4<6MqSLj{Yl-j>Z0Du0yjRG=io4oOaHYwQbb)FYj zPkTY3<&n?@@ZyfPHLM>T-rvW!tR(f=Y$IQCFJXXD1UU}$2y$X<(K~5nK$O2*Zwp$r^H#> zp5u4ud%THqy*(qd9GtTd44m(O~^p|{& zBUm*NB932Is7_90yt>f|-Z0tM_{GBKLwF}*V^scoZMSp-8Y{-Kl;L z56oS{yE)f~-~RF|;iX?xmV}%nvjyJc*)V`EaOg%K=`3py)`lYI5`cj){OLtw&$}Az zlE{!B!ra)CW ztJ)Mon9Nd4(2%uk} z;PCwXP3J#|!6!Tkeg>0mkSfaHfDkk=C-4aauq^R>DJ1WwxD0KVRp-+jybdLm)A^x z{8_D2^W+1)yGyZpV#E-QpM`ronOtZU@b};APVw4evb#1~A@`n4he<69r>rjf@4H8= zF3(u_iac;1jVLnBi&8soB8AiE3)cEz6BmU@P4JL;2$uCo=dn7Dz@*lpQ6=?9Mhec#djlhTwng$9d0rKXpM_0XKH<8-VqEtUY(>}$Y_=Gcd5-v}v*YgLAdB2QT1KIuq!st>({I~UdRp|BxVPsmRr)jl#> z;g|WVVEFF0zKAYEO1vyz5R9|=m4r)1pw@UwBejx%2+3^{N`y6-X z##a0#$WR94rc~PE^LbK7v$Y?Vw0)tbY*q6O87n{=IH@LbyntydFZDyIQMhp(PCuHl zJne(C^^;L*{PvpoCGP>)Tnpt1Y#jmM5ON%$kECRaBMubc6?~T!jP$diI;2)JU6Z)R z(o?~ja`eJelJ=c&obgq_P(xT72t}DRSzu-c60C05-CE2aPc;oSY0U-#-EHKW8vdTf zp8|>L^Zq;EcF*>mxqo17GnwyKlai_2;CqRtx3f_>X|v<0@AW$E@A;t$U!>_2+gOVg zthHTZGhWTONG8v*Y6JxtEHu8pc;n*jx*rv@F6jX(2V=`Gjq*<)?$$lgC^gNv87rk3 z$Z7JtgRjEJeUC1Y;$?Nc_#K4iD4}#A>axFvg_#@WmtIOOR<+nUr2g!^O7bOR{ zALuFwmO^qrLbfRQSh=4_J@reVqx0iczts4lpI(7=2{+p-#fEp5(dm^8JuMgRXH0YW z>E$Oww*EX#m09j#YMcj`#E>QKaw1PoQo_3kmH3}hPykS|7S?vc7bAP~c}`L@Mf&HS z+kak^3q>xPAl-m+p*3zN*DB>xO@HM2YrUDvNF+^`@>huXGXH zxq?s)t@nXl)8P3bydcf?GcwgQ+0Kth0lY8}TFkg8+W0L{;U+@PC7m5k-L&ju z{Q0nf%y(a%>bjeboVxa&hv)~F7X>k5s%jA{2W^IT>iQGQx5fOvXjYr{!9V`8A8G*y zR|m?_(pioFq8Ej(ss?}d{G;iqpPwul(h_k(wZG45|Icu`%n$G{(^GwzG4fuWW$E{x z>3TGxb}S?@ZSA@%V_sQSrRJ$U0ps?51kMLMiz{!$uMXQp>PUm-F`xWjHI}nATS^Yd z)M9|lbS|MeX4wz?;#Jy^l#q+jE1rHmMm}2@su!-8ef`=SXd#Twl_q;accuJLRS2w! zyo59|EYQqz!+_Hh#@jHoFpUw_&CD3GEwS$f<*hOBg2ny9G0#+k*qaj#)jB4kotAe_ z?1LnAV_9BAn;J$h2Ney{LmKIRz4m#?+z)c$D`!IXl$ZgU(G2e2FngU(NSa&fYL{Ll zL`UPbTts0yGCpv8_Q+=me-t(>OPOBHL4;GE!*Ij!MbJXzp|qyb7{&F4H{=3qW%o)w zsY!l_f=i&WQkAnEXhw}Sp)M;_vvAFpPIVRO%{9Ukb(0mb9EHU@GjI?5N;khbE6omN zhpbk)*!ihZ`WuVxw6~!O4<((67Ng%k@5eh&0WF|Nwz*KuwZPzoJKGLXzw-mS4#u{U z;MlK1Pe#w*{HWJ$Gp*8PGgmzSI7IhvnLw>M>CY3(yqQhLM`KSVKf9I_%Zb|a?`NOb zgj6ZKyOOGieo@|(pylFnukDKOx6vn~xlXf{?UJtSHlGHIxUQlGeVdT&=UPv6=Rk7d zrc@;05q_Mucq5r8*?ca%Fv8T_xd&lEi_(8roXrL{)1Hy~InR#4J>^zj{VG72q8<$? z>1I}Q^c|y+0a#ep@Nb)*U_rA22k^v+{aeiSCiP49h$pk`Q>z4jSr}!PaI-ZV+IUyd zrJo%q3%n0a2|{>w+6&nWFgl?Jk&5qS-|R91nq>?xVz_u25R(ifKmpT<%Z`?N&y%RL zQ!=h$-*?ns8cqt4|2tNwLsfz}=A_WmWQiSzq z`tlb$b)?-pbx_D&zkS~35{@&mnEmynsylVB;`w^n&7j!-xg!NcVKIuW(!ms;l%EHpEsPF3HYtDNi~ zUz(sbFTc`WPNy(SC3=zORyidg@Te1gNfCCu8dM@5Je+Ui6y$> zD={;}MZUEoGRQOAAL9DiEZ2PKMfSXEpql+%_E99VKDY@>?3EvI*O)ya)03_7*^byEbDL6Xr2`A5Y{2m1$PPMPrecWHhM3?l%SVQvHfKMy26(1DBEJURQc$C`P81_ z*CaNa*Z^W*ePw`|B8r2cENC%$ZEB3z%(=L(x#whjsLTlB^+Uw#Z^^uNl|IUuS%6)gm zYi6U9^{8vuc?v?*YS~iiBYbQ&tbYnl&$j-3U;mn{h6{_sEhl2{Z=!Fntou^l=7*)c zxBR}nEmFQWjkDF?){cqvn9s&|iYQu9GnhXUasl(@^f%7RDJjwWndP%_mUX*v z&$AKW(R)z_n*XvToa*n1p&&J)p_*}JoaQ~{#q%#1E_GLXuIzT(M~po36~1rweXUL` zNIQQgH8)Iasy|Tk#oww<*FV0^b)J{fcHQVfH%5}`f@}9aolT#rJqVK>F{=y0Z%rBs zWiRVH*4$jYvimt{ zVY`Z~VRbuSFFGSe0WsQL=$T9`;r9m(v5JDZMx=Of* zeCUMPyg?FvsCjyv^^+@jVq_M-ZxV&spFm@cNI zYFzc+GQF~>Rk`%7V1ICI;Z5r3MxFnOx?n-y7Y#qA1#&!Ww%pQ3-u(1`A=88jaHo`u nxp*Q|&4s_APvMa2m;P$kJiS}wnP{8~0Y3&8uUyE-+LHedQ;+DW literal 0 HcmV?d00001 From 0bba87cb3dba239b0a227fc76dd2eac343981091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Thu, 18 Sep 2025 09:45:33 +0800 Subject: [PATCH 03/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=8B=E5=A5=BD=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tag/TagManageList.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/tag/TagManageList.vue b/src/views/tag/TagManageList.vue index 788ccabe..e1963f85 100644 --- a/src/views/tag/TagManageList.vue +++ b/src/views/tag/TagManageList.vue @@ -236,8 +236,14 @@ export default { const originalStatus = row.isHot; try { // 调用 API 更新状态 - await apiCourseTag.changeTagHot(row); - this.$message.success('更新成功'); + await apiCourseTag.changeTagHot(row).then((res)=>{ + if (res.status == 200){ + this.$message.success(res.message); + }else { + row.isHot=false; + this.$message.warning(res.message); + } + }); } catch (error) { // 发生错误时回滚状态 row.isHot = originalStatus; From 2aa36c82ab4d72d5af111ad446bf7787b042633b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Fri, 19 Sep 2025 11:12:58 +0800 Subject: [PATCH 04/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE=E5=AD=97=E5=92=8C=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=8C=BA=E5=88=AB=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index cb7bdbae..25095522 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -334,8 +334,10 @@
搜索条件: - {{ - tag.tagName }} + + {{ tag.tagName }} +
清除 From a51d87fbe8976d4ddb513a43da1ccb277c5e8ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Fri, 19 Sep 2025 17:12:24 +0800 Subject: [PATCH 05/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=8B=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 25095522..4feed55f 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -371,6 +371,9 @@ 学习项目
+ + {{tag.tagName}} +
From fd10d99454aaf0671ea1b2c1d67ce134c02f4652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Mon, 22 Sep 2025 10:17:37 +0800 Subject: [PATCH 06/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tag/TagManageList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/tag/TagManageList.vue b/src/views/tag/TagManageList.vue index e1963f85..d5c615f9 100644 --- a/src/views/tag/TagManageList.vue +++ b/src/views/tag/TagManageList.vue @@ -23,8 +23,8 @@
- - + +
From 7230bd18e8f300b5b600dfca5b3d02cdd2f05144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Fri, 26 Sep 2025 19:03:56 +0800 Subject: [PATCH 07/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=97=A0=E7=9B=AE=E5=BD=95=E8=AF=BE=E7=A8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index b471460f..a4245a36 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -73,6 +73,9 @@ :props="{ value: 'id', label: 'name' }" :options="sysTypeListMap"> + + + 选择 From 18f38045362e58a29ce266cd18187f20bc4ba30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Sun, 28 Sep 2025 11:03:09 +0800 Subject: [PATCH 08/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index ec4a8f99..b1dd32a6 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -11,7 +11,7 @@ :remote-method="debouncedSearch" :loading="loading" :disabled="sysTypeList.length===0" - placeholder="按回车键Enter创建标签" + placeholder="请输入标签名称" @remove-tag="handleTagRemove" @change="handleSelectionChange" @keyup.enter.native="handleEnterKey" @@ -113,6 +113,7 @@ export default { this.loading = false; this.params = {}; }, + // 修改doSearch方法，添加搜索结果为空时的提示 async doSearch(query) { if (!query.trim()) { this.searchResults = [] @@ -126,6 +127,10 @@ export default { this.tagMap.set(item.id, item) }) this.searchResults = tags + // 当搜索结果为空时，提示用户可以按回车键创建标签 + if (tags.length === 0) { + this.$message.info('无此标签，按回车键创建') + } } finally { this.loading = false } From 5536fc06e18537f7a21875026ccf840d7aa047cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Sun, 28 Sep 2025 11:07:08 +0800 Subject: [PATCH 09/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E6=95=B0=E6=8D=AE=E4=B9=9F=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=9B=9E=E8=BD=A6=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 68 +++++++++++++++++++---------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index b1dd32a6..421c42ea 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -15,6 +15,8 @@ @remove-tag="handleTagRemove" @change="handleSelectionChange" @keyup.enter.native="handleEnterKey" + @keyup.delete.native="handleDeleteKey" + ref="tagSelect" > { - this.tagMap.set(item.id, item) - }) - this.searchResults = tags - // 当搜索结果为空时，提示用户可以按回车键创建标签 - if (tags.length === 0) { - this.$message.info('无此标签，按回车键创建') - } - } finally { - this.loading = false - } - }, handleTagRemove(tagId) { this.selectedTags = this.selectedTags.filter(id => id !== tagId) this.$emit('change', this.displayTags) + // 清空输入框内容 + if (this.$refs.tagSelect) { + const input = this.$refs.tagSelect.$refs.input + if (input) { + input.value = '' + } + } }, removeTag(tagId) { this.handleTagRemove(tagId) }, + // 新增：处理删除键事件 + handleDeleteKey(event) { + // 如果输入框内容为空，不执行任何搜索 + if (!event.target.value.trim()) { + this.searchResults = [] + } + }, + //按回车键，创建新标签 handleEnterKey(event) { const inputVal = event.target.value?.trim() @@ -155,6 +150,13 @@ export default { // 新增：处理选择变化事件 handleSelectionChange() { this.$emit('change', this.displayTags) + // 选择标签后清空输入框 + if (this.$refs.tagSelect) { + const input = this.$refs.tagSelect.$refs.input + if (input) { + input.value = '' + } + } }, //创建新标签 async createNewTag(tagName) { @@ -187,6 +189,28 @@ export default { this.loading = false } }, + // 修改doSearch方法，添加搜索结果为空时的提示 + async doSearch(query) { + if (!query.trim()) { + this.searchResults = [] + return + } + + this.loading = true + try { + const {result:tags} = await apiCourseTag.searchTags({tagName:query}) + tags.forEach(item => { + this.tagMap.set(item.id, item) + }) + this.searchResults = tags + // 当搜索结果为空时，提示用户可以按回车键创建标签 + if (tags.length === 0) { + this.$message.info('无此标签，按回车键创建') + } + } finally { + this.loading = false + } + } } } From b18500bad7f50747f0cda434aa2ea13249eb2165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Sun, 28 Sep 2025 11:12:06 +0800 Subject: [PATCH 10/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=20=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tag/TagManageList.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/tag/TagManageList.vue b/src/views/tag/TagManageList.vue index d5c615f9..5ee9434d 100644 --- a/src/views/tag/TagManageList.vue +++ b/src/views/tag/TagManageList.vue @@ -19,6 +19,8 @@ 查询 + + 重置
@@ -168,6 +170,15 @@ export default { }, methods: { + //重置搜索条件 + resetSearch() { + this.pageData.id = ''; + this.pageData.tagName = ''; + this.pageData.isHot = ''; + this.pageData.pageIndex = 1; + this.getCourseTagList(); // 重置后重新加载列表 + }, + //初始化：课程标签列表 getsearch(){ this.pageData.pageIndex = 1; From c9465492f4d92e8ca194b7933788aa7e2f913847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Sun, 28 Sep 2025 11:46:33 +0800 Subject: [PATCH 11/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=AA=E9=80=89=E6=8B=A9=E5=88=86=E7=B1=BB=E7=BB=99=E4=B8=AA?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 421c42ea..1320a392 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -11,7 +11,7 @@ :remote-method="debouncedSearch" :loading="loading" :disabled="sysTypeList.length===0" - placeholder="请输入标签名称" + :placeholder="sysTypeList.length > 0 ? '请输入标签名称' : '请先选择课程分类'" @remove-tag="handleTagRemove" @change="handleSelectionChange" @keyup.enter.native="handleEnterKey" From 581be5567fad7ccfdbd59d9bd55c87a6ed647eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Sun, 28 Sep 2025 11:59:09 +0800 Subject: [PATCH 12/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=AA=E9=80=89=E6=8B=A9=E5=88=86=E7=B1=BB=E7=BB=99=E4=B8=AA?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 1320a392..ef8e802c 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -11,7 +11,7 @@ :remote-method="debouncedSearch" :loading="loading" :disabled="sysTypeList.length===0" - :placeholder="sysTypeList.length > 0 ? '请输入标签名称' : '请先选择课程分类'" + :placeholder="sysTypeList.length === 0 ? '请先选择课程分类' : '请输入标签名称'" @remove-tag="handleTagRemove" @change="handleSelectionChange" @keyup.enter.native="handleEnterKey" From e55aa09409d360fd1cf490b4357c0112fc845f37 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 28 Oct 2025 16:42:07 +0800 Subject: [PATCH 13/84] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index a4245a36..8da89517 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -606,9 +606,11 @@ export default { console.log("父组件:",tags) let ids = ""; tags.forEach(tag=>{ + console.log("父组件name : ",tag.tagName) ids += tag.id + ','; }) this.courseInfo.tags = ids; + console.log("父组件ids : ",this.courseInfo.tags) }, showChooseOrg(){ this.$refs.refChooseOrg.dlgShow = true; @@ -1202,12 +1204,17 @@ export default { }, //保存课程信息并进入下一步 saveAndNext(btnType) { + console.log("courseForm 保存课程信息 btnType = " + btnType); //if(this.courseInfo.type) //console.log(this.courseCrowds,'courseCrowds'); //标签,多个，转化为逗号分隔的 + + console.log("courseForm 保存课程信息 this.showTags = " + this.showTags); + console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); if (this.showTags.length > 0) { this.courseInfo.tags = this.showTags.join(); } + console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); this.courseInfo.keywords = this.tips.join(',') || '' //检查输入是否合法 //if(!this.requireSaveCourse){ From a25ea0c4babb0ae4d27eb2abe899b3b6d030cbe1 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 29 Oct 2025 14:46:25 +0800 Subject: [PATCH 14/84] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=89=8D=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 2 +- src/components/Course/courseTag.vue | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 8da89517..138b4ef1 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1212,7 +1212,7 @@ export default { console.log("courseForm 保存课程信息 this.showTags = " + this.showTags); console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); if (this.showTags.length > 0) { - this.courseInfo.tags = this.showTags.join(); + this.courseInfo.tags = this.courseInfo.tags.join(); } console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); this.courseInfo.keywords = this.tips.join(',') || '' diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index ef8e802c..698deb61 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -142,7 +142,7 @@ export default { handleEnterKey(event) { const inputVal = event.target.value?.trim() if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) { - this.createNewTag(event.target.value.trim()) + // this.createNewTag(event.target.value.trim()) event.target.value = '' } }, @@ -198,7 +198,13 @@ export default { this.loading = true try { - const {result:tags} = await apiCourseTag.searchTags({tagName:query}) + try { + // 获取 typeId：取 sysTypeList 最后一个有效的值 + const typeId = this.sysTypeList.length > 2 ? this.sysTypeList[2] : + this.sysTypeList.length > 1 ? this.sysTypeList[1] : + this.sysTypeList.length > 0 ? this.sysTypeList[0] : null; + + const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId}) tags.forEach(item => { this.tagMap.set(item.id, item) }) From 4b92308d1d457144eaddb8b30e7837c10895f309 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 29 Oct 2025 14:59:23 +0800 Subject: [PATCH 15/84] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=89=8D=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 698deb61..34b39db7 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -198,7 +198,6 @@ export default { this.loading = true try { - try { // 获取 typeId：取 sysTypeList 最后一个有效的值 const typeId = this.sysTypeList.length > 2 ? this.sysTypeList[2] : this.sysTypeList.length > 1 ? this.sysTypeList[1] : From 8bf7a8e8e7289e1d56775c7f0dcef69ff5f51538 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 29 Oct 2025 15:27:43 +0800 Subject: [PATCH 16/84] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=89=8D=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 138b4ef1..5e931716 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1211,10 +1211,10 @@ export default { console.log("courseForm 保存课程信息 this.showTags = " + this.showTags); console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); - if (this.showTags.length > 0) { - this.courseInfo.tags = this.courseInfo.tags.join(); - } - console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); + // if (this.showTags.length > 0) { + // this.courseInfo.tags = this.courseInfo.tags.join(); + // } + // console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags); this.courseInfo.keywords = this.tips.join(',') || '' //检查输入是否合法 //if(!this.requireSaveCourse){ From 36b739d1392113c80a9983e54a9868e3c8c5e01b Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 30 Oct 2025 14:10:54 +0800 Subject: [PATCH 17/84] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=89=8D=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 34b39db7..b1e7571d 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -142,7 +142,7 @@ export default { handleEnterKey(event) { const inputVal = event.target.value?.trim() if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) { - // this.createNewTag(event.target.value.trim()) + this.createNewTag(event.target.value.trim()) event.target.value = '' } }, @@ -179,7 +179,7 @@ export default { if (this.sysTypeList.length > 2) { this.params.sysType3 = this.sysTypeList[2]; //三级的id } - const {result:newTag} = await apiCourseTag.createTag(this.params) + // const {result:newTag} = await apiCourseTag.createTag(this.params) this.$message.success('标签创建成功'); this.searchResults.push(newTag) console.log("----------newTag---------->",this.searchResults) From d94bcf96a14519fb52ab8ee3a1a6464bc470898d Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 30 Oct 2025 15:39:17 +0800 Subject: [PATCH 18/84] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=87=8A=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E4=BF=9D=E5=AD=98=E5=89=8D=E5=88=9B=E5=BB=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index b1e7571d..37851b34 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -179,8 +179,8 @@ export default { if (this.sysTypeList.length > 2) { this.params.sysType3 = this.sysTypeList[2]; //三级的id } - // const {result:newTag} = await apiCourseTag.createTag(this.params) - this.$message.success('标签创建成功'); + const {result:newTag} = await apiCourseTag.createTag(this.params) + this.$message.success('标签创建成功',newTag); this.searchResults.push(newTag) console.log("----------newTag---------->",this.searchResults) this.tagMap.set(newTag.id, newTag) From 3f028e5cd808f4210ce2d7354ead54ada8b4258d Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 30 Oct 2025 19:10:17 +0800 Subject: [PATCH 19/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 5 +++++ src/components/Course/courseTag.vue | 26 +++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 5e931716..6874dd94 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -604,6 +604,11 @@ export default { // 处理标签变化事件 handleTagsChange(tags) { console.log("父组件:",tags) + // 限制最多5个标签 + if (tags.length > 5) { + this.$message.warning('最多只能选择5个标签') + return + } let ids = ""; tags.forEach(tag=>{ console.log("父组件name : ",tag.tagName) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 37851b34..b02dcc98 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -25,6 +25,10 @@ :value="item" /> + +
+ {{ selectedTags.length }}/5 +
@@ -46,7 +50,7 @@ export default { }, maxTags: { type: Number, - default: 10 + default: 5 }, // 添加：接收初始标签数据的props initialTags: { @@ -144,6 +148,8 @@ export default { if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) { this.createNewTag(event.target.value.trim()) event.target.value = '' + } else if (this.selectedTags.length >= this.maxTags) { + this.$message.warning('最多只能添加5个标签') } }, @@ -165,6 +171,11 @@ export default { this.$message.error('标签不能超过8个字') return; } + // 添加标签数量限制检查 + if (this.selectedTags.length >= this.maxTags) { + this.$message.warning('最多只能添加5个标签') + return; + } this.loading = true try { this.params.courseId = this.courseId; @@ -231,4 +242,17 @@ export default { margin-right: 6px; margin-bottom: 6px; } + +/* 添加标签计数样式 */ +.tag-count { + position: absolute; + right: 10px; + top: 50%; + transform: translateY(-50%); + font-size: 12px; + color: #999; + background: white; + padding: 0 5px; + pointer-events: none; +} From 3e1b545d2aace752d6e08c1cff1d25ef100f2125 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 30 Oct 2025 19:42:31 +0800 Subject: [PATCH 20/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E4=B8=8B=E6=8B=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index b02dcc98..71e5e628 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -11,11 +11,12 @@ :remote-method="debouncedSearch" :loading="loading" :disabled="sysTypeList.length===0" - :placeholder="sysTypeList.length === 0 ? '请先选择课程分类' : '请输入标签名称'" + :placeholder="'请输入标签名称'" @remove-tag="handleTagRemove" @change="handleSelectionChange" @keyup.enter.native="handleEnterKey" @keyup.delete.native="handleDeleteKey" + @focus="handleFocus" ref="tagSelect" > { if (tag.id) this.tagMap.set(tag.id, tag); }); + }, + // 监听分类变化，重新加载搜索结果 + sysTypeList: { + handler() { + // 只有在已选择分类且有焦点时才重新加载 + if (this.sysTypeList.length > 0 && this.$refs.tagSelect && this.$refs.tagSelect.visible) { + this.doSearch(''); + } + }, + deep: true } }, methods: { + // 新增：处理输入框获得焦点事件 + async handleFocus() { + // 当输入框获得焦点时，加载默认的搜索结果 + if (this.sysTypeList.length > 0) { + await this.doSearch(''); + } + }, // 新增：重置标签状态的方法 resetTagState() { this.selectedTags = []; @@ -202,10 +220,11 @@ export default { }, // 修改doSearch方法，添加搜索结果为空时的提示 async doSearch(query) { - if (!query.trim()) { - this.searchResults = [] - return - } + // 不再在空查询时清空搜索结果 + // if (!query.trim()) { + // this.searchResults = [] + // return + // } this.loading = true try { From 86bcf06d879774a5653999034e09d6f61d71250b Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 30 Oct 2025 20:08:16 +0800 Subject: [PATCH 21/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E4=B8=8B=E6=8B=89=E8=B0=83=E6=95=B4=20=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 71e5e628..eaecdaeb 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -124,6 +124,7 @@ export default { methods: { // 新增：处理输入框获得焦点事件 async handleFocus() { + console.log("-- handleFocus --- " + this.sysTypeList.length) // 当输入框获得焦点时，加载默认的搜索结果 if (this.sysTypeList.length > 0) { await this.doSearch(''); @@ -225,15 +226,17 @@ export default { // this.searchResults = [] // return // } - + console.log("---- doSearch ------ query = " + query ) this.loading = true try { // 获取 typeId：取 sysTypeList 最后一个有效的值 const typeId = this.sysTypeList.length > 2 ? this.sysTypeList[2] : this.sysTypeList.length > 1 ? this.sysTypeList[1] : this.sysTypeList.length > 0 ? this.sysTypeList[0] : null; - + console.log("---- doSearch searchTags ------ query = " + query + " , typeId = " + typeId ) const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId}) + console.log("-- searchTags 查询结果 tags = " + tags ) + tags.forEach(item => { this.tagMap.set(item.id, item) }) From ba7bfe5f11f375a303edce04ec2f5502f1d6f4b6 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 11:09:09 +0800 Subject: [PATCH 22/84] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BA=93=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 4feed55f..faa29349 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -312,6 +312,9 @@
+
+ 热点标签: +
@@ -319,7 +322,7 @@
-
+
From 520fb4ee5e9733b75ad6cff62d1bbece3cd3dbb5 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 11:13:16 +0800 Subject: [PATCH 23/84] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=A0=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=97=B6=E9=99=90=E5=88=B6=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index eaecdaeb..21b601aa 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -10,7 +10,6 @@ reserve-keyword :remote-method="debouncedSearch" :loading="loading" - :disabled="sysTypeList.length===0" :placeholder="'请输入标签名称'" @remove-tag="handleTagRemove" @change="handleSelectionChange" From 78f681b4cb65ebc2d46b0d3fcbdfb9d16af1b3ef Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 13:33:41 +0800 Subject: [PATCH 24/84] =?UTF-8?q?=E7=83=AD=E7=82=B9=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index faa29349..bf396740 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -312,7 +312,7 @@
-
+
热点标签:
{{tag.tagName}}
+
+
+ {{tag.tagName}} +
+
Date: Fri, 31 Oct 2025 15:55:13 +0800 Subject: [PATCH 26/84] =?UTF-8?q?=E7=83=AD=E7=82=B9=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 54615c81..d7e84c3c 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -385,9 +385,17 @@ 学习项目
- - {{tag.tagName}} - + +
+ + {{ tag }} + +
@@ -2637,5 +2645,22 @@ a.custom2 { .hot-tags-container::-webkit-scrollbar { 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; +} /* ---end--- */ From f34d2a6e9455eba70f15d4067a7d03267ebad4f3 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 16:36:07 +0800 Subject: [PATCH 27/84] =?UTF-8?q?=E7=83=AD=E7=82=B9=E6=A0=87=E7=AD=BE+?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A0=87=E7=AD=BE=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 5 ++- src/views/portal/course/Index.vue | 61 +++++++++++++++++++++++++--- 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 6874dd94..14d97c5d 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1402,6 +1402,9 @@ export default { return true; }, submitCourse() { + console.log("courseForm 课程提交审核 this.showTags = " + this.showTags); + console.log("courseForm 课程提交审核 this.courseInfo.tags = " + this.courseInfo.tags); + if(this.biaoke.dlgShow && !this.unsavedContent()){ this.$message.error('您有未保存的内容，请先保存'); return; @@ -1439,7 +1442,7 @@ export default { return; } if (this.showTags.length > 0) { - this.courseInfo.tags = this.showTags.join(); + // this.courseInfo.tags = this.showTags.join(); } if (this.sysTypeList.length < 1) { this.$message.error('请选择内容分类'); diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index d7e84c3c..b137ed3d 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -311,16 +311,17 @@ -
+
+
+ 全部 +
{{tag.tagName}}
+
--> + +
+
+ 热点标签: +
+
+ +
+ 全部 + +
+ + +
+ {{tag.tagName}} + +
+
-
热点标签:
-
- + +
- 全部 + 全部
-
- {{tag.tagName}} + {{tag.tagName}}
@@ -882,7 +857,7 @@ export default { // 触发搜索 this.searchData(); - } + }, // 改变分页 currentChange(val) { @@ -2711,5 +2686,46 @@ a.custom2 { background-color: #387DF7 !important; color: white !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; + cursor: pointer; + white-space: nowrap; +} + +/* 保持原有的导航底部横线样式 */ +.nav-bottbor { + position: absolute; + top: 130%; + left: 0; + width: 100%; + height: 4px; + background: #387DF7; + border-radius: 5px; +} + +/* 响应式调整，当屏幕较小时减小标签间距 */ +@media (max-width: 1600px) { + .hot-tags-wrapper { + gap: 10px; + } +} + +@media (max-width: 1400px) { + .hot-tags-wrapper { + gap: 5px; + } +} /* ---end--- */ From 03b3c61c6b9e2b3351825694ca27257b618825b0 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 18:10:32 +0800 Subject: [PATCH 29/84] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 2 ++ src/views/portal/course/Index.vue | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 14d97c5d..75bee0e2 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -606,6 +606,8 @@ export default { console.log("父组件:",tags) // 限制最多5个标签 if (tags.length > 5) { + console.log("最多只能选择5个标签 tags : ",this.courseInfo.tags) + console.log("最多只能选择5个标签 showTags : ",this.showTags) this.$message.warning('最多只能选择5个标签') return } diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 4a75dc06..954c7d62 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -312,9 +312,9 @@
-
+
Date: Fri, 31 Oct 2025 18:21:08 +0800 Subject: [PATCH 30/84] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 75bee0e2..b473899d 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -606,8 +606,6 @@ export default { console.log("父组件:",tags) // 限制最多5个标签 if (tags.length > 5) { - console.log("最多只能选择5个标签 tags : ",this.courseInfo.tags) - console.log("最多只能选择5个标签 showTags : ",this.showTags) this.$message.warning('最多只能选择5个标签') return } @@ -618,6 +616,8 @@ export default { }) this.courseInfo.tags = ids; console.log("父组件ids : ",this.courseInfo.tags) + // 同时更新showTags，确保显示与实际数据一致 + this.showTags = tags.map(tag => tag.tagName); }, showChooseOrg(){ this.$refs.refChooseOrg.dlgShow = true; From cbe7981abd6e51cc44ad3ddd18442fff58d7b3d8 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 19:08:54 +0800 Subject: [PATCH 31/84] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 6 ++--- src/components/Course/courseTag.vue | 38 +++++++++++++++++++++++----- src/views/portal/course/Index.vue | 2 +- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index b473899d..80369172 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -607,6 +607,8 @@ export default { // 限制最多5个标签 if (tags.length > 5) { this.$message.warning('最多只能选择5个标签') + // 强制限制为5个 + tags = tags.slice(0, 5); return } let ids = ""; @@ -615,9 +617,7 @@ export default { ids += tag.id + ','; }) this.courseInfo.tags = ids; - console.log("父组件ids : ",this.courseInfo.tags) - // 同时更新showTags，确保显示与实际数据一致 - this.showTags = tags.map(tag => tag.tagName); + this.$emit('change', tags.slice(0, 5)); // 确保传出数据也不超过5个 }, showChooseOrg(){ this.$refs.refChooseOrg.dlgShow = true; diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 21b601aa..2a126745 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -23,6 +23,7 @@ :key="item.id" :label="item.tagName" :value="item" + :disabled="isTagDisabled(item)" /> @@ -66,7 +67,9 @@ export default { tagMap: new Map(), inputBuffer: '', params: {}, - tag: {} + tag: {}, + // 添加临时存储用于回滚 + previousTags: [] } }, computed: { @@ -121,9 +124,19 @@ export default { } }, methods: { + // 新增：检查标签是否应该被禁用 + isTagDisabled(tag) { + // 如果标签已经被选中，不应该禁用（允许取消选择） + const isSelected = this.selectedTags.some(selectedTag => selectedTag.id === tag.id); + if (isSelected) { + return false; + } + // 如果标签未被选中且已达到最大数量，则禁用 + return this.selectedTags.length >= this.maxTags; + }, // 新增：处理输入框获得焦点事件 async handleFocus() { - console.log("-- handleFocus --- " + this.sysTypeList.length) + this.previousTags = [...this.selectedTags]; // 当输入框获得焦点时，加载默认的搜索结果 if (this.sysTypeList.length > 0) { await this.doSearch(''); @@ -172,16 +185,27 @@ export default { }, // 新增：处理选择变化事件 - handleSelectionChange() { - this.$emit('change', this.displayTags) - // 选择标签后清空输入框 + handleSelectionChange(newValues) { + // 检查数量限制 + if (newValues.length > this.maxTags) { + this.$message.warning(`最多只能选择${this.maxTags}个标签`); + // 回滚到之前的状态 + this.selectedTags = [...this.previousTags]; + return; + } + + // 更新前保存当前状态 + this.previousTags = [...newValues]; + this.$emit('change', this.displayTags); + if (this.$refs.tagSelect) { - const input = this.$refs.tagSelect.$refs.input + const input = this.$refs.tagSelect.$refs.input; if (input) { - input.value = '' + input.value = ''; } } }, + //创建新标签 async createNewTag(tagName) { // 标签不能超过八个字 diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 954c7d62..1b0f3083 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -2694,7 +2694,7 @@ a.custom2 { gap: 15px; align-items: center; padding-top: 2px; - margin-left: 90px; /* 为"热点标签:"文本留出空间 */ + //margin-left: 90px; /* 为"热点标签:"文本留出空间 */ } /* 调整option-item样式以适应换行布局 */ From 8e51663b86bec9c52a839f446b08d5cad03b225e Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 31 Oct 2025 20:19:35 +0800 Subject: [PATCH 32/84] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Detail.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue index 0b5a3dd1..869071b6 100644 --- a/src/views/portal/course/Detail.vue +++ b/src/views/portal/course/Detail.vue @@ -30,13 +30,14 @@ +
+ {{item}} +
{{courseInfo.studys}}人学习
-
- {{item}} -
+ ",this.searchResults) + + this.selectedTags = [...this.selectedTags, newTag]; + // 更新搜索结果的逻辑保持不变 + this.searchResults = [newTag, ...this.searchResults]; this.tagMap.set(newTag.id, newTag) this.$emit('change', this.displayTags) + + this.$nextTick(() => { + // 强制重新设置selectedTags来触发更新 + const tempTags = [...this.selectedTags]; + this.selectedTags = []; + this.$nextTick(() => { + this.selectedTags = tempTags; + }); + this.$refs.tagSelect.visible = false; + }); } finally { this.loading = false } @@ -273,10 +293,10 @@ export default { console.log("---- doSearch ------ query = " + query ) this.loading = true try { - // 获取 typeId：取 sysTypeList 最后一个有效的值 + // 获取 typeId：取 sysTypeList 最后一个有效的值 const typeId = this.sysTypeList.length > 2 ? this.sysTypeList[2] : - this.sysTypeList.length > 1 ? this.sysTypeList[1] : - this.sysTypeList.length > 0 ? this.sysTypeList[0] : null; + this.sysTypeList.length > 1 ? this.sysTypeList[1] : + this.sysTypeList.length > 0 ? this.sysTypeList[0] : null; console.log("---- doSearch searchTags ------ query = " + query + " , typeId = " + typeId ) const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId}) console.log("-- searchTags 查询结果 tags = " + tags ) From 7be0bdee6c48746fad59dd00a663663b2ab22ac5 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 15:26:21 +0800 Subject: [PATCH 41/84] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 1b0f3083..0622c0f4 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -284,7 +284,7 @@
-
+
全部
@@ -398,6 +398,7 @@ :key="tagIndex" size="mini" type="info" style="margin: 2px 2px; border-radius: 2px;" + :style="{ fontWeight: isTagMatched(tag) ? 'bold' : 'normal' }" > {{ tag }} @@ -846,6 +847,14 @@ export default { // window.removeEventListener("scroll", this.handleScroll); }, methods: { + + isTagMatched(tag) { + // 检查stagList中是否有匹配的标签 + return this.stagList.some(searchTag => + searchTag.tagName === tag || searchTag.name === tag + ); + }, + // 添加清除热点标签选中的方法 handleClearHotTags() { // 清除所有热点标签的选中状态 @@ -1076,7 +1085,7 @@ handleClearTags() { // 强制触发stagList重新计算 this.$nextTick(() => { - this.searchData(); + // this.searchData(); }); }, //三级分类 From af10b1fa3277a8dfafe8ab54662132f48de42c6e Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 17:16:41 +0800 Subject: [PATCH 42/84] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 38 ++++++++++++++++--------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 0622c0f4..774f83ea 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -330,7 +330,7 @@ class="option-item" style="font-weight: bold; padding-top: 2px;" v-for="tag in hotTagsList" :key="tag.id" - @click="handleTagClick(tag, hotTagsList)" + @click="handleTagClick(tag, hotTagsList,1)" :class="{ 'option-active': tag.checked }" > {{tag.tagName}} @@ -1075,7 +1075,7 @@ handleClearTags() { this.searchData(); }, //点击标签 - handleTagClick(item, list) { + handleTagClick(item, list,type) { item.checked = !item.checked; // 更新course.tags @@ -1085,7 +1085,7 @@ handleClearTags() { // 强制触发stagList重新计算 this.$nextTick(() => { - // this.searchData(); + this.searchData(type); }); }, //三级分类 @@ -1326,13 +1326,13 @@ handleClearTags() { this.$refs.floatTools.toNeedCourse(); }, - searchData() { + searchData(type) { this.course.pageIndex = 1; this.noPageList = true; //判断接口是否还有数据 this.noDataList = true; //判断接口是否还有数据 this.courseList = []; this.totalPages = 4; - this.search(); + this.search(type); }, inputOn() { this.$forceUpdate(); @@ -1498,7 +1498,7 @@ handleClearTags() { return list; }, // 查询 - async search() { + async search(type) { // if (this.searching) { this.$message.warning("正在搜索中，请待搜索完成后再重新搜索"); @@ -1542,18 +1542,20 @@ handleClearTags() { that.course.sysType3 += item.id; } }); - apiCourseTag.getHotTagList(that.course).then(rs => { - if (rs.status == 200) { - // 保留已选中标签的状态 - const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked); - this.hotTagsList = rs.result.map(tag => ({ - ...tag, - checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id) - })); - } else { - console.log(rs.message); - } - }), + if (!type && type !== 1){ + apiCourseTag.getHotTagList(that.course).then(rs => { + if (rs.status == 200) { + // 保留已选中标签的状态 + const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked); + this.hotTagsList = rs.result.map(tag => ({ + ...tag, + checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id) + })); + } else { + console.log(rs.message); + } + }) + } this.isFind = true; this.course.device = 1; if (this.course.pageIndex == 1) { From 6a764dd6982bde871e2d5c74ffd2700d12104f07 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 17:29:39 +0800 Subject: [PATCH 43/84] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 774f83ea..be046379 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -284,7 +284,7 @@
-
+
全部
From c49d69dedee3c5b69664090acfbc90384ea30f36 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 17:35:06 +0800 Subject: [PATCH 44/84] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index be046379..8dd22570 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -1033,7 +1033,7 @@ export default { ct.checked = false; }) } - this.searchData(); + this.searchData(1); }, // 清除 handleClearTags() { @@ -1072,7 +1072,7 @@ handleClearTags() { // }) // item.checked=true; - this.searchData(); + this.searchData(1); }, //点击标签 handleTagClick(item, list,type) { From 51c3d298541d8957e6a283beffc41400e2766034 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 17:48:59 +0800 Subject: [PATCH 45/84] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 8dd22570..ee529bd8 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -284,7 +284,7 @@
-
+
全部
From 25cb97f462c40b97e1ff50d9ca750d5657c72cbc Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 18:44:09 +0800 Subject: [PATCH 46/84] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BA=93=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 24 +++++++++++++++++++++ src/views/portal/course/Index.vue | 33 +++++++++++++++++------------ 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 74483d77..4b64113c 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -345,4 +345,28 @@ export default { line-height: 25px; /* 垂直居中文字 */ box-sizing: border-box; /* 确保padding包含在height内 */ } + + + +::v-deep(.el-select__tags) { + display: flex; + 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; + margin-bottom: 4px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +::v-deep(.el-select__input) { + flex: 1; + min-width: 60px; +} diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index ee529bd8..75704561 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -2682,20 +2682,27 @@ a.custom2 { } /* 添加标签样式 */ -.course-tags { - margin: 5px 0; - min-height: 20px; +//.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; // 默认深灰色 } -.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[style*="color: #387DF7"] { + color: #387DF7 !important; // 匹配时的蓝色 } /* 添加热点标签容器样式，支持换行 */ From a2640771fb579430547f9e57cca770a4f0f12d9b Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Tue, 4 Nov 2025 18:50:08 +0800 Subject: [PATCH 47/84] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BA=93=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 75704561..2c2579e2 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -398,7 +398,7 @@ :key="tagIndex" size="mini" type="info" style="margin: 2px 2px; border-radius: 2px;" - :style="{ fontWeight: isTagMatched(tag) ? 'bold' : 'normal' }" + :style="{ color: isTagMatched(tag) ? '#387DF7' : '#333333' }" > {{ tag }} From ef9e4a0f68a1e3f1b44e8cf5af35f487566a7472 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 5 Nov 2025 14:38:00 +0800 Subject: [PATCH 48/84] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=AD?= =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index 4b64113c..b87ac90a 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -230,6 +230,12 @@ export default { this.$message.error('标签不能超过8个字') return; } + // 检查标签是否在下拉框中已存在 + const isExistInSearch = this.searchResults.some(tag => tag.tagName === tagName); + if (isExistInSearch) { + this.$message.warning('已存在此标签，请选择'); + return; + } // 首先检查是否与已选择的标签重复 const isDuplicate = this.selectedTags.some(tag => tag.tagName === tagName); if (isDuplicate) { From 2678d223025b1f1b5fba46367f59088b20d1070b Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sat, 8 Nov 2025 09:06:44 +0800 Subject: [PATCH 49/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 218 ++++++++++++++++++------------ 1 file changed, 130 insertions(+), 88 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 2c2579e2..4a6bab16 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -283,58 +283,59 @@
-->
-
-
- 全部 - +
+
+
+ 全部 + +
+
+ 录播课 + +
+
+ 线下课 + +
+
+ 学习项目 + +
+ + U选小课堂 + + + + +
-
- 录播课 - -
-
- 线下课 - -
-
- 学习项目 - -
- - U选小课堂 - - - - -
-
-
- 全部 - -
+
+
+ 全部 + +
-
- {{tag.tagName}} - +
+ {{tag.tagName}} + +
@@ -1036,33 +1037,33 @@ export default { this.searchData(1); }, // 清除 -handleClearTags() { - //清空所有的条件 - this.keyword = ''; - this.ctypeList.forEach(item => { - item.checked = false; - }); - this.hotTagsList.forEach(item => { - item.checked = false; - }); - this.course.tags = ''; // 清空标签ID - - // 添加清除三级分类的逻辑 - this.oneList.forEach(one => { - one.checked = false; - one.children.forEach(two => { - two.checked = false; - two.children.forEach(three => { - three.checked = false; + handleClearTags() { + //清空所有的条件 + this.keyword = ''; + this.ctypeList.forEach(item => { + item.checked = false; }); - }); - }); + this.hotTagsList.forEach(item => { + item.checked = false; + }); + this.course.tags = ''; // 清空标签ID - // 清空导航标题 - this.navTitle = []; + // 添加清除三级分类的逻辑 + this.oneList.forEach(one => { + one.checked = false; + one.children.forEach(two => { + two.checked = false; + two.children.forEach(three => { + three.checked = false; + }); + }); + }); - this.searchData(); -}, + // 清空导航标题 + this.navTitle = []; + + this.searchData(); + }, // 导航切换(录播课，线下课，学习项目) handleTypeClick(item, list) { item.checked = !item.checked; @@ -1580,7 +1581,7 @@ handleClearTags() { if (item.teacher) { item.teacher = item.teacher.split(',').filter(itemValue => itemValue !== 'BOE教师').join(','); // if (dotIdx > 0) { - // item.teacher = item.teacher.substring(0, dotIdx); + // item.teacher = item.teacher.substring(0, dotIdx); // } } if (item.teacher && item.teacher == 'BOE教师') { @@ -1856,6 +1857,9 @@ handleClearTags() { .topNav { display: flex; margin-bottom: 20px; + height: auto; + min-height: 80px; + align-items: center; .nav { display: flex; @@ -2333,8 +2337,8 @@ handleClearTags() { margin-left: 15px; font-size: 14px; color: #3d3d3d; - cursor: pointer; - position: relative; + //cursor: pointer; + //position: relative; } .uxicon { @@ -2465,6 +2469,8 @@ handleClearTags() { background: #fff; padding: 10px 25px; border-radius: 8px; + height: auto; + min-height: 60px; ::v-deep .el-input { width: 420px; @@ -2588,7 +2594,8 @@ handleClearTags() { color: #3d3d3d; display: inline-block; font-size: 14px; - margin: 0px 15px; + //margin: 0px 15px; + font-weight: normal; } .option-border { @@ -2602,7 +2609,7 @@ handleClearTags() { .option-active { color: #387DF7; } - /* 项目简介 方法一：外部 CSS 类 */ +/* 项目简介 方法一：外部 CSS 类 */ ::v-deep.el-dialog { border-radius: 3% 3% 1% 1%; padding: 0; @@ -2628,12 +2635,23 @@ handleClearTags() { padding: 0 !important; } /* ---end--- */ -/* ---标签管理 added by zhengsongbo on 2025-08-01--- */ +// 2025-11-07 10:00 修改 .search-div.nav { display: block; width: 100%; clear: both; } +//.search-div.nav { +// display: flex; +// flex-direction: column; +// height: auto; +// min-height: 100px; +//} +//.hot-tags-area { +// width: 100%; +// margin-top: 15px; +//} + .option-item { margin: 0px 5px; } @@ -2672,7 +2690,7 @@ a.custom2 { .hot-tags-container { display: inline-block; - white-space: nowrap; + //white-space: nowrap; overflow-x: auto; vertical-align: top; } @@ -2705,16 +2723,6 @@ 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; @@ -2745,5 +2753,39 @@ a.custom2 { gap: 5px; } } -/* ---end--- */ +// 2025-11-07 10:00 修改 +.hot-tags-wrapper { + display: flex; + flex-wrap: wrap; + gap: 15px; + align-items: center; + padding-top: 2px; +} +//.hot-tags-wrapper { +// display: grid; +// grid-template-columns: repeat(auto-fill, minmax(120px, max-content)); +// gap: 15px 20px; +// align-items: center; +// justify-items: start; +// width: 100%; +// padding: 10px 0; +//} +//.hot-tags-wrapper .option-item { +// position: relative; +// cursor: pointer; +// white-space: nowrap; +// padding: 5px 10px; +// text-align: center; +//} +.course-tags { + margin: 5px 0; + min-height: 20px; +} + +.course-tag-item { + color: #333333; +} +.course-tag-item[style*="color: #387DF7"] { + color: #387DF7 !important; +} From 372a7c22edb236f46ed1e14b238156c52598a32d Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sat, 8 Nov 2025 09:29:40 +0800 Subject: [PATCH 50/84] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BA=A2=E8=89=B2=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 4a6bab16..1d43487d 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -355,8 +355,7 @@
搜索条件: - + {{ tag.tagName }}
From 9b11cc3f92881298d592d08bce28064294e82b71 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sat, 8 Nov 2025 11:42:43 +0800 Subject: [PATCH 51/84] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=A0=87=E7=AD=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Detail.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue index 2ede1ee4..7d8a0beb 100644 --- a/src/views/portal/course/Detail.vue +++ b/src/views/portal/course/Detail.vue @@ -420,7 +420,7 @@ export default { .course-title{ position: relative; - height: 60px; + height: auto; display: flex; justify-content: space-between; .title { @@ -462,9 +462,17 @@ export default { margin: 5px 0; min-height: 20px; .label-item { - padding: 0 7px; + padding: 0px 8px; + margin-top: 5px; + float: left; + line-height: 24px; + font-size: 12px; + border-radius: 2px; margin-right: 8px; - margin-bottom: 0px; + color: #2C68FF; + height: 24px; + background: rgba(44, 104, 255, 0.06); + border: none; // 或者使用 border-color: transparent; } } ::v-deep .el-rate__icon { From 73026b0ab55667f9de160feb6d85c00f847b0c27 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sat, 8 Nov 2025 14:46:53 +0800 Subject: [PATCH 52/84] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseTag.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index b87ac90a..cac8686e 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -11,6 +11,7 @@ :remote-method="debouncedSearch" :loading="loading" :placeholder="'回车创建新标签'" + :no-data-text="'无此标签，按回车键创建'" @remove-tag="handleTagRemove" @change="handleSelectionChange" @keyup.enter.native="handleEnterKey" From 89a9be76d471a28724093d87040142d03f628dcf Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 9 Nov 2025 15:25:13 +0800 Subject: [PATCH 53/84] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/qualityCourse.vue | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/qualityCourse.vue b/src/views/portal/course/qualityCourse.vue index ccb17b11..8f2d1e96 100644 --- a/src/views/portal/course/qualityCourse.vue +++ b/src/views/portal/course/qualityCourse.vue @@ -148,6 +148,18 @@ 学习项目
+ +
+ + {{ tag }} + +
@@ -653,7 +665,12 @@ export default { this.navTitle = [] this.searchData(); }, - + isTagMatched(tag) { + // 检查stagList中是否有匹配的标签 + return this.stagList.some(searchTag => + searchTag.tagName === tag || searchTag.name === tag + ); + }, // 导航全选 handleTypeAllClick(t) { if (t == 1) { @@ -1887,7 +1904,7 @@ export default { right: 23.5%; // bottom: 26%; top: 0; - height: 20; + height: 20px; line-height: 20px; font-size: 12px; color: #FFFFFF; From d5ec4c1833b3954fa11fbbe49413c1204f06e525 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 9 Nov 2025 16:25:03 +0800 Subject: [PATCH 54/84] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/qualityCourse.vue | 167 +++++++++++++++------- 1 file changed, 113 insertions(+), 54 deletions(-) diff --git a/src/views/portal/course/qualityCourse.vue b/src/views/portal/course/qualityCourse.vue index 8f2d1e96..41013f36 100644 --- a/src/views/portal/course/qualityCourse.vue +++ b/src/views/portal/course/qualityCourse.vue @@ -89,6 +89,32 @@
+
+ +
+
+
+ 全部 + +
+ +
+ {{tag.tagName}} + +
+
+
+
@@ -328,25 +354,45 @@ export default { let list = []; }, - // 取消搜索条件标签展示 - stagList() { //计算出选择的内容 + stagList() { let list = []; + + // 关键词 if (this.keyword) { list.push({ type: 0, id: 'keyword', name: this.keyword, + tagName: this.keyword, checked: true - }) + }); } - // 取消 全部 内部专享 外部精选 三种的显示 - // this.ctypeList.forEach(item => { - // if (item.checked) { - // list.push(item); - // } - // }); + + // 课程类型 + this.ctypeList.forEach(item => { + if (item.checked) { + list.push({ + ...item, + tagName: item.name + }); + } + }); + + // 热点标签 - 这是关键修复 + this.hotTagsList.forEach(item => { + if (item.checked) { + list.push({ + ...item, + name: item.tagName || item.name, + tagName: item.tagName || item.name, + type: 14 + }); + } + }); + + // 三级分类 this.oneList.forEach(one => { - var twoChildChecked = false;//是否有下级 + var twoChildChecked = false; one.children.forEach(two => { if (two.checked) { twoChildChecked = true; @@ -354,34 +400,28 @@ export default { var threeChildChecked = false; two.children.forEach(three => { if (three.checked) { - list.push(three); + list.push({ + ...three, + tagName: three.name + }); threeChildChecked = true; } }); if (two.checked && !threeChildChecked) { - list.push(two); + list.push({ + ...two, + tagName: two.name + }); } }); if (one.checked && !twoChildChecked) { - list.push(one); + list.push({ + ...one, + tagName: one.name + }); } - }) - // this.oneList.forEach(item=>{ - // if(item.checked){ - // list.push(item); - // } - // }); - // this.twoList.forEach(item=>{ - // if(item.checked){ - // list.push(item); - // } - // }); - // this.threeList.forEach(item=>{ - // if(item.checked){ - // list.push(item); - // } - // }); - //console.log(list,'list'); + }); + return list; }, ctypeTagAll() { @@ -575,6 +615,37 @@ export default { // window.removeEventListener("scroll", this.handleScroll); }, methods: { + isAllHotTagsSelected() { + return !this.hotTagsList.some(tag => tag.checked); + }, + handleClearHotTags() { + // 清除所有热点标签的选中状态 + this.hotTagsList.forEach(tag => { + tag.checked = false; + }); + // 清空course.tags + this.course.tags = ''; + + // 触发搜索 + this.searchData(); + }, + handleTagClick(item, list,type) { + item.checked = !item.checked; + + // 更新course.tags + const checkedTags = this.hotTagsList.filter(tag => tag.checked); + let tagIds = checkedTags.map(tag => tag.id).join(','); + this.course.tags = tagIds; + this.$forceUpdate(); + this.searchData(type); + + // 强制触发stagList重新计算 + // this.$nextTick(() => { + // this.searchData(type); + // }); + }, + + // 改变分页 currentChange(val) { this.course.pageIndex = val @@ -2219,30 +2290,18 @@ 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; -// } -// }] +.hot-tags-wrapper { + display: flex; + flex-wrap: wrap; + gap: 15px; + align-items: center; + padding-top: 2px; +} +.search-div.nav { + display: block; + width: 100%; + clear: both; +} .search-item-type { line-height: 25px; padding-right: 10px; From 1d20f1186182adb8ab4710e2f6012ca85c743c66 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Mon, 10 Nov 2025 08:54:17 +0800 Subject: [PATCH 55/84] =?UTF-8?q?=E7=B2=BE=E5=93=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/qualityCourse.vue | 476 +++++++++------------- 1 file changed, 182 insertions(+), 294 deletions(-) diff --git a/src/views/portal/course/qualityCourse.vue b/src/views/portal/course/qualityCourse.vue index 41013f36..0a58f422 100644 --- a/src/views/portal/course/qualityCourse.vue +++ b/src/views/portal/course/qualityCourse.vue @@ -2,48 +2,32 @@
+ @showClass="showClass">
-
-
精品课程
-
{{ one.name }}
+ @click.stop="handleOptionClick(twoList, 2, one.children)" + :class="{ courseTwoActive: twoList.id == twoId || twoList.checked }" @mouseleave.stop="leaveIndex" + @mouseenter.stop="changeIndex(twoList.id)"> + :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover" + :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
{{ - twoList.name }}
+ twoList.name }}
@@ -51,8 +35,8 @@
+ :key="threeList.id" @click.stop="handleOptionClick(threeList, 3, twoList.children)" + class="course-three"> {{ threeList.name }}
@@ -70,31 +54,49 @@
-
-
-
- 全部 - + +
+
+
+
+ 全部 + +
+ +
+ 内部专享 + +
+
+ 外部精选 + +
-
- 内部专享 - -
-
- 外部精选 - +
+ 请选择年份 + + + +
+
-
-
+
+
@@ -103,7 +105,8 @@
-
- 请选择年份 - - - - -
-
@@ -138,7 +128,7 @@
搜索条件 {{ - tag.name }} + tag.name }}
清除 @@ -151,13 +141,13 @@
全部课程 + :class="{ actice: course.orderField == 'DEFAULT' }">全部课程 最热 + :class="{ actice: course.orderField == 'HOT' }">最热 最新 + :class="{ actice: course.orderField == 'NEW' }">最新 好评率 + :class="{ actice: course.orderField == 'GOOD' }">好评率 共找到{{ count }}个结果 @@ -190,7 +180,7 @@
+ :disabled="!keyword.showTitle"> @@ -198,7 +188,7 @@
- +
开课时间：{{ cinfo.startTime }}
@@ -214,7 +204,7 @@
+ :praises="false" :shares="false" :views="false">
{{ toScore(cinfo.courseScore) }}分
@@ -259,7 +249,7 @@
+ layout="total, prev, pager, next, jumper" @change-page="currentChange">
@@ -296,17 +286,6 @@
创新力专区课程版权已到期！
-
@@ -334,7 +313,7 @@ import {formatDate, formatUserNumber, toScore} from "@/utils/tools.js"; import apiSearchterm from "@/api/modules/searchterm.js"; import apiPlace from "@/api/phase2/place.js" import {qualityCourseTimeMark, qualityPageList} from "@/api/phase2" - +import apiCourseTag from '@/api/modules/courseTag.js' export default { name: "index", components: { @@ -354,6 +333,41 @@ export default { let list = []; }, + // 取消搜索条件标签展示 + /*stagList() { //计算出选择的内容 + let list = []; + if (this.keyword) { + list.push({ + type: 0, + id: 'keyword', + name: this.keyword, + checked: true + }) + } + this.oneList.forEach(one => { + var twoChildChecked = false;//是否有下级 + one.children.forEach(two => { + if (two.checked) { + twoChildChecked = true; + } + var threeChildChecked = false; + two.children.forEach(three => { + if (three.checked) { + list.push(three); + threeChildChecked = true; + } + }); + if (two.checked && !threeChildChecked) { + list.push(two); + } + }); + if (one.checked && !twoChildChecked) { + list.push(one); + } + }) + return list; + },*/ + stagList() { let list = []; @@ -430,24 +444,6 @@ export default { }); return !flag; }, - // oneTagAll() { - // let flag = this.oneList.some(item => { - // return item.checked; - // }); - // return !flag; - // }, - // twoTagAll() { - // let flag = this.twoList.some(item => { - // return item.checked; - // }); - // return !flag; - // }, - // threeTagAll() { - // let flag = this.threeList.some(item => { - // return item.checked; - // }); - // return !flag; - // } }, data() { return { @@ -515,7 +511,8 @@ export default { searchRecords: [], hotList: [], totalPages: 1, - localSessionKey: this.$xpage.constants.localCourseFiltersKey + localSessionKey: this.$xpage.constants.localCourseFiltersKey, + hotTagsList: [], }; }, // 受众需要每次刷新 @@ -535,17 +532,6 @@ export default { qualityCourseTimeMark().then(response=>{ this.years = response.data.result }) - // let screenWidth = window.screen.availWidth; - // if (screenWidth < 1280) { - // this.course.pageSize = 9; - // this.columns = 3; - // } else if (screenWidth < 1600) { - // this.course.pageSize = 12; - // this.columns = 3; - // } else if (screenWidth >= 1600) { - // this.course.pageSize = 15; - // this.columns = 3; - // } let el_top = document.querySelector("#searchbar"); let el_search = document.querySelector("#searchbar"); @@ -571,8 +557,6 @@ export default { this.loadSysTypes(); this.getScoreList(); this.getHotList(); - // this.toCourseDetail(item); - // this.orderChange(id); //查询排行榜，页面打开只查询一次 let localKey = "user_" + this.userInfo.sysId + "_gids"; if (this.audiences.length == 0) { @@ -591,30 +575,15 @@ export default { } this.search(); }) - // Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{ - // //console.log(rs,'rs'); - // let aids=[]; - // if(rs[0].status==200){ - // aids.push(rs[0].result); - // } - // if(rs[1].status==200){ - // aids.push(rs[1].result); - // } - // this.audiences=aids; - // sessionStorage.setItem(localKey,this.audiences); - // this.search(); - // }) } } - - //this.searchterm();//搜索词已经没有了 this.couresreso();//广告位 - }, beforeDestroy() { // window.removeEventListener("scroll", this.handleScroll); }, methods: { + isAllHotTagsSelected() { return !this.hotTagsList.some(tag => tag.checked); }, @@ -630,6 +599,7 @@ export default { this.searchData(); }, handleTagClick(item, list,type) { + console.info('切换标签 item = ' + item) item.checked = !item.checked; // 更新course.tags @@ -727,15 +697,55 @@ export default { } }, //搜索条件 + // 搜索条件 stagClose(tag, tagIndex) { this.courseChosen = void 0; tag.checked = false; + if (tag.type == 0) { + // 关键词类型 this.keyword = ''; + } else if (tag.type == 1) { + // 课程类型 + this.ctypeList.forEach(item => { + if (item.id == tag.id) { + item.checked = false; + } + }); + } else if (tag.type == 14) { + // 热点标签类型 + this.hotTagsList.forEach(item => { + if (item.id == tag.id) { + item.checked = false; + } + }); + // 更新course.tags + const checkedHotTags = this.hotTagsList.filter(tag => tag.checked); + let tagIds = checkedHotTags.map(tag => tag.id).join(','); + this.course.tags = tagIds; + } else if (tag.type == 11 || tag.type == 12 || tag.type == 13) { + // 三级分类标签 + this.oneList.forEach(one => { + if (one.id == tag.id) { + one.checked = false; + } + one.children.forEach(two => { + if (two.id == tag.id) { + two.checked = false; + } + two.children.forEach(three => { + if (three.id == tag.id) { + three.checked = false; + } + }); + }); + }); } + this.navTitle = [] this.searchData(); }, + isTagMatched(tag) { // 检查stagList中是否有匹配的标签 return this.stagList.some(searchTag => @@ -779,10 +789,23 @@ export default { handleClearTags() { //清空所有的条件 this.keyword = ''; - // 取消搜索条件标签展示 - // this.ctypeList.forEach(item => { - // item.checked = false; - // }); + + // 清除课程类型 + this.ctypeList.forEach(item => { + item.checked = false; + }); + + // 清除热点标签 + this.hotTagsList.forEach(item => { + item.checked = false; + }); + // 清空course.tags + this.course.tags = ''; + + // 清除年份选择 + this.yearChosen = []; + + // 清除三级分类 this.oneList.forEach(one => { one.checked = false; one.children.forEach(two => { @@ -792,7 +815,8 @@ export default { }) }) }); - // 清除左侧被选中的内容 + + // 清除左侧被选中的内容 this.courseChosen = void 0; this.twoList = []; this.threeList = []; @@ -801,6 +825,7 @@ export default { sessionStorage.removeItem(this.localSessionKey) this.searchData(); }, + // 导航切换(录播课，线下课，学习项目) handleTypeClick(item, list) { // item.checked = !item.checked; @@ -839,57 +864,6 @@ export default { }) }) }) - - // item.checked = !item.checked; - //使用上面一行是可以多选，使用下面是单选 - // list.forEach(row => { - // row.checked = false; - // }) - // item.checked = true; - // //以下是新的规则的修改， - // if (!item.checked) { - // //清空它下面的所有的中的 - // item.children.forEach(subItem => { - // subItem.checked = false; - // if (subItem.children) { - // subItem.children.forEach(sub => { - // sub.checked = false; - // }) - // } - // }); - // if (level == 1) { - // this.twoList = []; - // this.threeList = []; - // } - // if (level == 2) { - // this.threeList = []; - // } - // this.searchData(); - // return; - // } - - // let $this = this; - // if (level == 1) { //一级的情况 - // this.twoList = []; - // this.threeList = []; - // let lastCheked = null; - // item.children.forEach(two => { - // $this.twoList.push(two); - // if (two.checked) { - // lastCheked = two; - // } - // }); - // if (lastCheked != null) { - // $this.threeList = lastCheked.children; - // item.children.forEach(three => { - // }); - // } - // } else if (level == 2) { //二级的情况 - // this.threeList = item.children; - // } else if (level == 3) { //三级的情况 - - // } - //this.handleChangeTypes(item); this.searchData(); }, // 无用 @@ -899,18 +873,6 @@ export default { this.twoList = []; this.threeList = []; let $this = this; - // this.oneList.forEach(one=>{ - // if(one.checked){ - // one.children.forEach(two=>{ - // $this.twoList.push(two); - // if(two.checked){ - // two.children.forEach(three=>{ - // $this.threeList.push(three); - // }) - // } - // }); - // } - // }) this.oneList.forEach(one => { if (one.checked) { one.children.forEach(two => { @@ -941,15 +903,6 @@ export default { checked: false } if (item.children) { - //增加死数据 - // item.children.push({ - // type: 12, - // id: item.id * (index + 200), - // name: '线上品牌系列课程', - // children: [], - // checked: false, - // newData: true - // }) item.children.forEach(subItem => { let newSubItem = { type: 12, @@ -1016,47 +969,16 @@ export default { this.keyword = val; this.searchData(); }, - - // 滚动 - // handleScroll() { - // if (this.courseList.length > 6) { - - // let innerHeight = document.querySelector("#couser-list-content").clientHeight; - // let outerHeight = document.documentElement.clientHeight; - // let scrollTop = document.documentElement.scrollTop; - // let outerWidth = document.querySelector(".xcontent2-minor").clientWidth; - // if (outerHeight + scrollTop + 350 >= innerHeight) { - // if (this.moreState == 1 && this.course.pageIndex < 4) { - // this.loadMore(); - // } - // } - // //console.log(this.course.pageIndex,'this.course.pageIndex'); - // //加此判断，是为了没有数据时的闪动问题 - // //if(this.course.pageIndex >1){ - // if (scrollTop > 1176) { - // document.querySelector("#fixd-box").style.cssText = - // "position: fixed;top: -882px;width:" + outerWidth + "px"; - // } else { - // document.querySelector("#fixd-box").style.cssText = "position: static"; - // } - // //} - // } - // }, - - toNeedCourse() {// 上传 - // 需要先切换标签 - //this.$store.dispatch('SetCurIdentity',2); - //this.$router.push('/need/course?open=new'); + toNeedCourse() { this.$refs.floatTools.toNeedCourse(); - }, - searchData() { + searchData(type) { this.course.pageIndex = 1; this.noPageList = true; //判断接口是否还有数据 this.noDataList = true; //判断接口是否还有数据 this.courseList = []; this.totalPages = 4; - this.search(); + this.search(type); }, inputOn() { this.$forceUpdate(); @@ -1216,17 +1138,12 @@ export default { return list; }, // 查询 - async search () { - // + async search (type) { if (this.searching) { this.$message.warning("正在搜索中，请待搜索完成后再重新搜索"); return; } this.searching = true; - //测试时间格式化 - // let s=1650973801; - // var d = new Date(1650973801*1000); - // console.log(formatDateByFmt(d,'yyyy-MM-dd hh:mm'),'data'); this.saveLocalFilters(); let that = this; if (this.keyword) { @@ -1237,7 +1154,6 @@ export default { this.course.audiences = this.audiences.join(","); } //console.log(this.userInfo) - //this.course.companyId=this.userInfo.companyId; this.course.type = "";//不使用单查询了 this.course.types = ""; this.course.sysType1 = ""; @@ -1260,6 +1176,20 @@ export default { that.course.sysType3 += item.id; } }); + if (!type && type !== 1){ + apiCourseTag.getHotTagList(that.course).then(rs => { + if (rs.status == 200) { + // 保留已选中标签的状态 + const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked); + this.hotTagsList = rs.result.map(tag => ({ + ...tag, + checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id) + })); + } else { + console.log(rs.message); + } + }) + } this.isFind = true; this.course.device = 1; @@ -1279,6 +1209,9 @@ export default { params.pageNum = pageIndex params.orderByType = orderField params.courseSource = this.ctypeList.findIndex(e => e.checked) + if (params.courseSource === -1) { + params.courseSource = 0 + } this.yearChosen.length && (params.years = this.yearChosen) params.courseName = this.keyword delete params.userId @@ -1291,44 +1224,8 @@ export default { console.log(res.status) if (res.status === 200) { this.totalPages = res.data.result.pages; - // res.result.list.forEach(item => { - // if (item.startTime != '') { - // item.startTime = formatDateByFmt(new Date(item.startTime * 1000), 'yyyy-MM-dd hh:mm') - // //let time = item.startTime.split('-'); - // //item.startTime = `${time[0]}年${time[1]}月${time[2]}日` - // } - // //教师转化 - // if (item.teacher) { - // item.teacher = item.teacher.split(',').filter(itemValue => itemValue !== 'BOE教师').join(','); - // // if (dotIdx > 0) { - // // item.teacher = item.teacher.substring(0, dotIdx); - // // } - // } - // if (item.teacher && item.teacher == 'BOE教师') { - // item.teacher = ''; - // } - // - // //转化标红显示 - // item.title = item.name; - // if (that.course.keyword) { - // item.name = that.brightenKeyword(item.name, that.course.keyword); - // item.keywordsActive = that.brightenKeywords(item.keywordsList, that.course.keyword) - // console.log(item.keywordsActive); - // } else { - // item.name = item.name; - // } - // }); const list = res.data.result.records ?? [] - // list.forEach(course=>{ - // const id = course.courseId - // - // apiCourse.getTeacherByCourseIDs([id]).then(res=>{ - // console.log(res, "ids res") - // course.teacher = res.result[0].names[0] - // console.log(`course.teacher`, course.teacher) - // }) - // }) this.courseList = list if (this.newData) { @@ -1389,18 +1286,7 @@ export default { this.moreState = 2; }); }, - // showInApply() { - // this.inapply.show = true; - // }, - // pushEnter(type) { - // this.type1.push(type); - // }, - // deleteOut(type) { - // this.type1 = this.type.filter(item => item != type); - // }, - // chooseShow(type) { - // return this.type1.some(item => item == type); - // }, + getAnkingData() { apiCourse.ranking().then(res => { if (res.status == 200) { @@ -2205,7 +2091,7 @@ export default { border-radius: 8px; ::v-deep .el-input { - width: 420px; + //width: 420px; height: 38px; //margin-bottom: 13px; @@ -2327,4 +2213,6 @@ export default { .option-active { color: #387DF7; -} +} + + From df3e246d25483218254339ec15a76194a9d9cf24 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Mon, 10 Nov 2025 10:24:02 +0800 Subject: [PATCH 56/84] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=AF=BC=E8=88=AA=E5=8F=96=E6=B6=88=E5=8A=A0=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/qualityCourse.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/qualityCourse.vue b/src/views/portal/course/qualityCourse.vue index 0a58f422..aea5e904 100644 --- a/src/views/portal/course/qualityCourse.vue +++ b/src/views/portal/course/qualityCourse.vue @@ -96,7 +96,7 @@
@@ -106,7 +106,7 @@
Date: Mon, 10 Nov 2025 10:29:56 +0800 Subject: [PATCH 57/84] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=AF=BC=E8=88=AA=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/qualityCourse.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/course/qualityCourse.vue b/src/views/portal/course/qualityCourse.vue index aea5e904..fc55ffa4 100644 --- a/src/views/portal/course/qualityCourse.vue +++ b/src/views/portal/course/qualityCourse.vue @@ -70,7 +70,7 @@
+ :class="{ 'option-active': ctypeList[2].checked }" style="padding-left: 15px;"> 外部精选
From 8228b33cb0b157a9a238ab722b882178e9c49212 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Mon, 10 Nov 2025 18:49:54 +0800 Subject: [PATCH 58/84] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/course.js | 9 +- src/components/Course/courseForm.vue | 633 +++++++++++++++++++-------- src/components/Course/courseTag.vue | 40 +- 3 files changed, 470 insertions(+), 212 deletions(-) diff --git a/src/api/modules/course.js b/src/api/modules/course.js index 00db854c..197ee0e2 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -440,6 +440,12 @@ 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, @@ -482,6 +488,7 @@ export default { exportCourseAudit, exportCourse, queryCrowd, - ids + ids, + saveTip } diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 888f6573..fc28e01b 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -5,15 +5,15 @@ -
- 是 - 否 -
+
+ 是 + 否 +
- - + +
@@ -41,6 +41,41 @@ 确定 --> + + +
+
+
操作引导
+
+
+
1
+
+
设置内容分类
+
当选择内容分类后，其关联标签将在下拉列表中优先显示。
+
+
+
+
2
+
+
添加课程标签
+
为课程添加相关标签,最多5个，便于搜索和分类,可回车创建新标签
+
+
+
+ +
+
+ + +
+ + @@ -64,22 +99,30 @@
- + + :options="sysTypeListMap" + @focus="onContentTypeFocus" + @change="onContentTypeChange"> + - - + + + + + - - 选择 - + + 选择 + @@ -112,11 +155,11 @@ - + - + @@ -153,11 +196,11 @@ + maxlength="255" + show-word-limit + :rows="3" + v-model="courseInfo.summary" + placeholder="请尽量填写课程简介，用于列表中显示，可以让用户更容易了解课程信息"> @@ -221,14 +264,16 @@
- + + :options="sysTypeListMap" + @focus="onContentTypeFocus" + @change="onContentTypeChange"> @@ -256,21 +301,25 @@ --> - - + + + + - - {{ tag }} - + + {{ tag }} + - - 选择 - + + 选择 + @@ -278,13 +327,13 @@ - + - + @@ -397,8 +446,8 @@ - - + + 确 定 @@ -536,7 +585,13 @@ export default { dlgShow: false }, rightTypeId: {}, - catalogSortDialogShow: false + catalogSortDialogShow: false, + // 蒙层引导相关数据 + showGuidance: false, + currentStep: 1, + highlightStyle: {}, + guidanceElements: [], + isFirstCreate: false, // 标记是否为首次创建 }; }, created() { @@ -620,14 +675,14 @@ export default { this.$emit('change', tags.slice(0, 5)); // 确保传出数据也不超过5个 }, showChooseOrg(){ - this.$refs.refChooseOrg.dlgShow = true; + this.$refs.refChooseOrg.dlgShow = true; }, removeCrowd(e){ //console.log(e); if(e.disabled){ - this.$message.error("您不能移除创建人加的受众"); - this.courseCrowds.push(e); - return false; + this.$message.error("您不能移除创建人加的受众"); + this.courseCrowds.push(e); + return false; } }, confirmChooseOrg(orgInfo,parentInfo){ @@ -696,17 +751,17 @@ export default { // } // }); apiUserBasic.getUserAudiences(params).then(rs=>{ - if(rs.status==200){ - let crowdList=[]; - rs.result.list.forEach(item=>{ - crowdList.push({ - id:item.id, - name:item.audienceName, - disabled:false - }) - }); - this.userGroupList=crowdList; - } + if(rs.status==200){ + let crowdList=[]; + rs.result.list.forEach(item=>{ + crowdList.push({ + id:item.id, + name:item.audienceName, + disabled:false + }) + }); + this.userGroupList=crowdList; + } }) }, resOwnerName(code) { @@ -799,9 +854,9 @@ export default { if (!editData) { this.tips=[]; this.courseTags=[], - //console.log("新建课程？"); - //以下为了保证初始化处理 - this.weikeReset = Math.round(Math.random()) + ''; + //console.log("新建课程？"); + //以下为了保证初始化处理 + this.weikeReset = Math.round(Math.random()) + ''; this.onlineReset = Math.round(Math.random()) + ''; this.courseChooseShow = true; this.biaoke.tabIndex = 'base'; @@ -822,11 +877,11 @@ export default { // }); apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{ if(rs.status==200){ - this.orgName=rs.result.name; - this.courseInfo.orgName=rs.result.name; - //this.orgKid=rs.result.kid; - this.orgNamePath=rs.result.namePath; - } + this.orgName=rs.result.name; + this.courseInfo.orgName=rs.result.name; + //this.orgKid=rs.result.kid; + this.orgNamePath=rs.result.namePath; + } }); } @@ -849,7 +904,7 @@ export default { }, resetCurCourseContent() { - this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentName: '', contentRefId: '', courseId: this.courseInfo.id }; + this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentRefId: '', courseId: this.courseInfo.id }; }, // chooseCourseType(item, idx, open) { // this.courseChooseId = item.id; @@ -897,6 +952,12 @@ 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 { @@ -904,12 +965,102 @@ export default { } this.$nextTick(() => { this.initTagComponent(); + // 如果显示引导，初始化高亮元素 + if (this.showGuidance) { + this.$nextTick(() => { + this.initGuidanceElements(); + this.highlightCurrentStep(); + }); + } }); } 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) { + const rect = currentElement.getBoundingClientRect(); + this.highlightStyle = { + top: `${rect.top}px`, + left: `${rect.left}px`, + width: `${rect.width}px`, + height: `${rect.height}px`, + }; + + // 滚动到可见区域 + 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) { @@ -956,29 +1107,29 @@ export default { if(!this.courseInfo.orgId){ //根据课程创建者获取机构id apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{ - if(ors.status==200){ - $this.courseInfo.orgId=ors.result.id; - // apiOrg.getSimple(ors.result.id).then(rrs=>{ - // if(rrs.status==200){ - // $this.orgName=rrs.result.name; - // $this.orgKid=rrs.result.kid; - // $this.orgNamePath=rrs.result.namePath; - // } - // }) - apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{ - if(rrs.status==200){ - $this.orgName=rrs.result.name; - this.courseInfo.orgName=rrs.result.name; - //$this.orgKid=rrs.result.kid; - $this.orgNamePath=rrs.result.namePath; - }else{ - this.courseInfo.orgId=''; - //this.$message.error('资源归属已变更，请重新选择'); - } - }) - }else{ - //this.$message.error('无机构关联，不需要提示'); - } + if(ors.status==200){ + $this.courseInfo.orgId=ors.result.id; + // apiOrg.getSimple(ors.result.id).then(rrs=>{ + // if(rrs.status==200){ + // $this.orgName=rrs.result.name; + // $this.orgKid=rrs.result.kid; + // $this.orgNamePath=rrs.result.namePath; + // } + // }) + apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{ + if(rrs.status==200){ + $this.orgName=rrs.result.name; + this.courseInfo.orgName=rrs.result.name; + //$this.orgKid=rrs.result.kid; + $this.orgNamePath=rrs.result.namePath; + }else{ + this.courseInfo.orgId=''; + //this.$message.error('资源归属已变更，请重新选择'); + } + }) + }else{ + //this.$message.error('无机构关联，不需要提示'); + } }) }else{ @@ -994,14 +1145,14 @@ export default { // }); apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{ if(rs.status==200){ - $this.orgName=rs.result.name; - $this.courseInfo.orgName=rs.result.name; - //$this.orgKid=rs.result.kid; - $this.orgNamePath=rs.result.namePath; - }else{ - $this.courseInfo.orgId=''; - $this.$message.error('资源归属已变更，请重新选择'); - } + $this.orgName=rs.result.name; + $this.courseInfo.orgName=rs.result.name; + //$this.orgKid=rs.result.kid; + $this.orgNamePath=rs.result.namePath; + }else{ + $this.courseInfo.orgId=''; + $this.$message.error('资源归属已变更，请重新选择'); + } }); } this.resOwnerArray=[]; @@ -1016,33 +1167,33 @@ export default { } this.sysTypeList=[]; if(result.course.sysType1!='' && result.course.sysType1!='0'){ - this.sysTypeList.push(result.course.sysType1); + this.sysTypeList.push(result.course.sysType1); } if(result.course.sysType2!='' && result.course.sysType2!='0'){ - this.sysTypeList.push(result.course.sysType2); + this.sysTypeList.push(result.course.sysType2); } if(result.course.sysType3!='' && result.course.sysType3!='0'){ - this.sysTypeList.push(result.course.sysType3); + this.sysTypeList.push(result.course.sysType3); } //console.log(this.sysTypeList,'this.sysTypeList'); //受众处理，crowds let crowdList=[]; if(result.crowds && result.crowds.length>0){ - result.crowds.forEach(crowd=>{ - let newCrowd={ - id:crowd.groupId, - name:crowd.groupName, - disabled:false - } - crowdList.push(newCrowd); - let hasUG=$this.userGroupList.some(ug=>{ - return ug.id==crowd.groupId; - }); - if(!hasUG){ - newCrowd.disabled=true; - $this.userGroupList.push(newCrowd); - } + result.crowds.forEach(crowd=>{ + let newCrowd={ + id:crowd.groupId, + name:crowd.groupName, + disabled:false + } + crowdList.push(newCrowd); + let hasUG=$this.userGroupList.some(ug=>{ + return ug.id==crowd.groupId; }); + if(!hasUG){ + newCrowd.disabled=true; + $this.userGroupList.push(newCrowd); + } + }); } this.courseCrowds=crowdList; //反向看userGroupList是否有 @@ -1110,7 +1261,7 @@ export default { inputValue: sec.name, confirmButtonText: '确定', cancelButtonText: '取消', - inputPattern:/^(a-z|A-Z|0-9)*[^$%^&*;:,<>?()\""\']{1,20}$/, + inputPattern:/^(a-z|A-Z|0-9)*[^$%^&*;:,<>?()\""\']{1,20}$/, inputErrorMessage:'不要超过20个字' }) .then(({ value }) => { @@ -1171,7 +1322,7 @@ export default { let order = []; if(cha.contents.length > 0) { cha.contents.forEach(con=>{ - order.push(con.sortIndex); + order.push(con.sortIndex); }) let addOrder = order.sort(function(a,b) {return b-a;}) this.addOrder = addOrder[0] + 1; @@ -1339,9 +1490,9 @@ export default { if(this.curContent.id == '') {// 新增 if(this.curContent.contentType == 60) { // 判断作业是否保存 - if(courseware.homework.content || courseware.homework.name || courseware.homework.deadTime){ - pass = false; - } + if(courseware.homework.content || courseware.homework.name || courseware.homework.deadTime){ + pass = false; + } } else if(this.curContent.contentType == 61) { //考试 // if(courseware.exam.paperContent != '') { @@ -1352,11 +1503,11 @@ export default { // } }else if(this.curContent.contentType == 41) { //图文 if(courseware.htmlContent.length > 7){ - pass = false; + pass = false; } }else if(this.curContent.contentType == 52) { //外部链接 if(courseware.linkInfo.url != '') { - pass = false; + pass = false; } } } else {// 编辑 @@ -1371,15 +1522,15 @@ export default { // } } else if(this.curContent.contentType == 41) { //图文 if(this.curContent.content !== courseware.htmlContent) { - pass = false; + pass = false; } } else if(this.curContent.contentType == 52) { //外部链接 if(this.curContent.content !== JSON.stringify(courseware.linkInfo)) { - pass = false; + pass = false; } } else if(this.curContent.contentType == 10 || this.curContent.contentType == 20) {// 视频 if(this.curContent.content !== JSON.stringify(courseware.curriculumData)) { - pass = false; + pass = false; } } } @@ -1541,61 +1692,61 @@ export default { //2023-1-5 对于默认管理员，不需要提交hrbp。直接提交并发布 let adminType=this.userInfo.adminType; if(adminType==1){ //默认管理员,直接审核通过 - apiCourseAudit.submitAndPublish(postData).then(res=>{ - setTimeout(function() { - $this.btnLoading = false; - }, 1000); - if (res.status === 200) { - //提交成功，直接关闭当前窗口 - this.$message.success('提交成功！！！'); - } else { - this.$message.error(res.message); - } - this.biaoke.dlgShow = false; - this.weike.dlgShow = false; - this.$emit('submitSuccess'); - }); + apiCourseAudit.submitAndPublish(postData).then(res=>{ + setTimeout(function() { + $this.btnLoading = false; + }, 1000); + if (res.status === 200) { + //提交成功，直接关闭当前窗口 + this.$message.success('提交成功！！！'); + } else { + this.$message.error(res.message); + } + this.biaoke.dlgShow = false; + this.weike.dlgShow = false; + this.$emit('submitSuccess'); + }); }else{ - //先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息 - apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{ - if(rs.status==200 && rs.result){ - postData.auditUser={ - email:rs.result.email, - code:rs.result.userNo, - name:rs.result.name, - aid:rs.result.id, - orgId:rs.result.orgId - } - //下面的机构名称，路径不对，应该取课程的资源归属（机构）的路径 - postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName; - apiCourse.submitCourse(postData).then(res => { - //this.btnLoading=false; - setTimeout(function() { - $this.btnLoading = false; - }, 1000); - if (res.status === 200) { - //提交成功，直接关闭当前窗口 - this.$message.success('提交成功！！！'); - this.biaoke.dlgShow = false; - this.weike.dlgShow = false; - //提交成功回调处理 - this.$emit('submitSuccess'); - } else { - this.$message.error(res.message); - this.biaoke.dlgShow = false; - this.weike.dlgShow = false; - this.$emit('submitSuccess'); - } - }); - }else{ - $this.btnLoading = false; - this.$message.error('获取审核HRBP失败:'+rs.message); + //先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息 + apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{ + if(rs.status==200 && rs.result){ + postData.auditUser={ + email:rs.result.email, + code:rs.result.userNo, + name:rs.result.name, + aid:rs.result.id, + orgId:rs.result.orgId } - }).catch(err=>{ - //this.$message.error('获取审核HRBP失败:'+err); - this.$message.error('获取审核HRBP失败，请检查资源归属下是否有HRBP审核人员'); - $this.btnLoading = false; - }) + //下面的机构名称，路径不对，应该取课程的资源归属（机构）的路径 + postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName; + apiCourse.submitCourse(postData).then(res => { + //this.btnLoading=false; + setTimeout(function() { + $this.btnLoading = false; + }, 1000); + if (res.status === 200) { + //提交成功，直接关闭当前窗口 + this.$message.success('提交成功！！！'); + this.biaoke.dlgShow = false; + this.weike.dlgShow = false; + //提交成功回调处理 + this.$emit('submitSuccess'); + } else { + this.$message.error(res.message); + this.biaoke.dlgShow = false; + this.weike.dlgShow = false; + this.$emit('submitSuccess'); + } + }); + }else{ + $this.btnLoading = false; + this.$message.error('获取审核HRBP失败:'+rs.message); + } + }).catch(err=>{ + //this.$message.error('获取审核HRBP失败:'+err); + this.$message.error('获取审核HRBP失败，请检查资源归属下是否有HRBP审核人员'); + $this.btnLoading = false; + }) } }, // 教师列标，远程查询 @@ -1704,19 +1855,19 @@ export default { diff --git a/src/components/Course/courseTag.vue b/src/components/Course/courseTag.vue index cac8686e..5c6257c1 100644 --- a/src/components/Course/courseTag.vue +++ b/src/components/Course/courseTag.vue @@ -1,23 +1,22 @@ -