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);
 }
+
+#app {
+  pointer-events: none;
+}
+
+#app > *:not(.case-expert-dialog) {
+  pointer-events: auto;
+}
+
+.case-expert-dialog {
+  pointer-events: auto;
+}
 </style>

src/api/ajax.js

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

src/api/boe/boeAjax.js

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

src/api/boe/boeApiAjax.js

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

src/api/cesource/index.js

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

src/api/event/index.js

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

src/components/PortalHeader.vue

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

src/security.js

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

src/utils/xajax.js

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

src/views/Index.vue

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

src/views/Loading.vue

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

src/views/portal/case/AICall.vue

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

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;