Merge branch 'master' into ebiz-uat-2025-11-06

src/App.vue

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

src/views/Index.vue

@@ -153,28 +153,29 @@
       </div>
     </div>
     <div class="xindex-content">
-      
+
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
         <!-- <div class="xcontent2-main"> -->
           <!--内容块-->
-        
+
           <!-- </div> -->
            <!-- 精品课模块 -->
         <div class="xcontent2-main">
           <div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
-            <!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
+            <!-- <span class="jin-text">精品课</span> -->
+             <div class="jin-zhe"></div>
             <span class="quyer-tag" style="margin-left: 0px;">
-              <!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
               <img class="modules-text" style="height: 28px;" src="../assets/images/course/courseTitle.png" alt="">
             </span>
+
             <span class="more">
               <router-link to="/qualityCourse">查看更多>></router-link>
             </span>
           </div>
 
 
-          
+
           <div
               v-for="(course, eIndex) in exquisiteList"
               :key="'cc' + eIndex"
@@ -231,7 +232,7 @@
             </div>
 
 
-        
+
           <!--内容块-->
           <div class="modules-title xindex-main">
             <span class="modules-text">推荐课程</span>
@@ -1308,7 +1309,7 @@ export default {
       return this.courseList.list.slice(3)
     },
     // 精品课展示
-    exquisiteList() { 
+    exquisiteList() {
       return this.qusisityList.list.slice(0,3)
     },
   },
@@ -1567,7 +1568,7 @@ export default {
       let course = {
         aid: this.userInfo.aid,
       }
-      apiIndex.qualitylist(course).then((res) => { 
+      apiIndex.qualitylist(course).then((res) => {
          let courseIds = [];
           res.data.result.forEach((item) => {
             item.authorInfo = {
@@ -2826,6 +2827,15 @@ export default {
   display: flex;
 
   .modules-title {
+    position: relative;
+    .jin-zhe{
+      width: 410px;
+      height: 30px;
+      background: #f7f7f9;
+      position: absolute;
+      left: 86px;
+
+}
     .modules-text {
       height: 28px;
       font-size: 20px;
@@ -3136,4 +3146,13 @@ export default {
   border: 1px solid #d9edf7;
   //overflow: hidden;
 }
+.jin-text{
+  font-family: "Source Han Sans CN", "SourceHanSansCN", sans-serif !important;
+  font-weight: bold;
+  font-size: 20px;
+  color: #3E87F5;
+  // line-height: 29px;/
+  text-align: justify;
+  font-style: normal;
+}
 </style>

src/views/portal/case/AICall.vue

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

src/views/portal/case/components/sendMessage.vue

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

src/views/portal/course/Index.vue

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

src/views/portal/course/qualityCourse.vue

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