From d895e769792a4a55af72a3b3837334d202a96187 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Fri, 11 Aug 2023 14:23:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E9=A2=86=E5=9F=9F=E9=85=8D=E4=B8=80=E4=B8=8B=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                | 3 +++
 .env.production                 | 3 +++
 .env.testing                    | 3 +++
 src/views/portal/case/Index.vue | 5 ++++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 83473a3e..d2297b04 100644
--- a/.env.development
+++ b/.env.development
@@ -45,3 +45,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 # scorm课件的播放url地址
 VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player'
+
+#案例组织领域类型
+VUE_APP_CASE_TYPE = '90'
diff --git a/.env.production b/.env.production
index 22880556..195e48a9 100644
--- a/.env.production
+++ b/.env.production
@@ -43,3 +43,6 @@ VUE_APP_LOGIN_URL='https://u.boe.com/web/'
 
 # scorm课件的播放url地址
 VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player'
+
+#案例组织领域类型
+VUE_APP_CASE_TYPE = '155'
diff --git a/.env.testing b/.env.testing
index 955282d6..d6c3ac9f 100644
--- a/.env.testing
+++ b/.env.testing
@@ -42,3 +42,6 @@ VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
 
 # scorm课件的播放url地址
 VUE_APP_SCORM_URL = 'https://u-pre.boe.com/newscorm/scorm-player'
+
+#案例组织领域类型
+VUE_APP_CASE_TYPE = '90'
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index d6c47028..ae914955 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -361,6 +361,7 @@ export default {
   },
   data() {
     return {
+      caseType:process.env.VUE_APP_CASE_TYPE,//类型
       caseYears:[],
       refId: '',//消息跳转案例的id
       selectList: [],//点击选中的list
@@ -574,7 +575,9 @@ export default {
     console.log(isBack, 'isBack');
     // Promise.all([apiType.items("org_domain"), apiCase.majorTypes()]).then(rs => {
       // 90是测试环境，155是生产环境
-    Promise.all([apiType.treeList(1,155,1), apiCase.majorTypes()]).then(rs => {
+      console.log(this.caseType);
+
+    Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
       if (rs[0].code == 200) {
         const {records} = rs[0].data
         records.forEach(item => {

From 4b2816e183721e45ff836081204b37ba8d8f2e3b Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Mon, 14 Aug 2023 12:27:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=92=8C=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue   |  12 +++
 src/views/portal/case/Index.vue   |   2 +-
 src/views/portal/course/Index.vue | 118 +++++++++++++++++-------------
 3 files changed, 81 insertions(+), 51 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index b7f65272..e1dda6e9 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -153,6 +153,10 @@ export default {
     goSearch:{
       type: Number,
       default: 0,
+    },
+    keywords:{
+      type:String,
+      default:''
     }
   },
 
@@ -170,6 +174,14 @@ export default {
         }
     }
   },
+  watch:{
+    keywords(newval){
+      console.log(newval,9999);
+      if(this.findType == '1'){
+        this.keyword = newval
+      }
+    }
+  },
   data() {
     return {
       popupConfig:{},
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index ae914955..6d975239 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -1073,7 +1073,7 @@ export default {
     },
 
     async getCaseData() {
-      // this.saveLocalFilters();//存储本地刷新有记录
+      this.saveLocalFilters();//存储本地刷新有记录
       let majorTypeList = [];
       let allFielclass = JSON.parse(JSON.stringify(this.getAllFielclass()));
       // 获取树状id
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index e5cf4c7d..9b6e97ec 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="couser-list-content" class="couser-list-content">
     <div class="course-banner">
-      <portal-header current="course" textColor="#fff" @emitInput="emitInput" @showClass="showClass"></portal-header>
+      <portal-header current="course" textColor="#fff" :keywords="keyword" @emitInput="emitInput" @showClass="showClass"></portal-header>
     </div>
     <div style="padding-top:30px">
       <div class="xcontent2">
@@ -714,38 +714,38 @@ export default {
     // this.toCourseDetail(item);
     // this.orderChange(id);
     //查询排行榜，页面打开只查询一次
-    let localKey = "user_" + this.userInfo.sysId + "_gids";
-    if (this.audiences.length == 0) {
-      //let hasIds;
-      let hasIds = sessionStorage.getItem(localKey);
-      if (hasIds && hasIds.length > 0) {
-        this.audiences = hasIds.split(",");
-        this.search();
-      } else {
-        apiUserbasic.getInAudienceIds().then(rs => {
-          if (rs.status == 200) {
-            this.audiences = rs.result;
-            sessionStorage.setItem(localKey, this.audiences);
-          } else {
-            console.log(rs.message);
-          }
-          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();
-        // })
-      }
-    }
+    // let localKey = "user_" + this.userInfo.sysId + "_gids";
+    // if (this.audiences.length == 0) {
+    //   //let hasIds;
+    //   let hasIds = sessionStorage.getItem(localKey);
+    //   if (hasIds && hasIds.length > 0) {
+    //     this.audiences = hasIds.split(",");
+    //     this.search();
+    //   } else {
+    //     apiUserbasic.getInAudienceIds().then(rs => {
+    //       if (rs.status == 200) {
+    //         this.audiences = rs.result;
+    //         sessionStorage.setItem(localKey, this.audiences);
+    //       } else {
+    //         console.log(rs.message);
+    //       }
+    //       // 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();//广告位
@@ -799,22 +799,39 @@ export default {
       let hasData = sessionStorage.getItem(this.localSessionKey);
       let $this = this;
       if (hasData) {
-        // let typeCodeList=JSON.parse(hasData);
-        // typeCodeList.forEach(item=>{
-        //    if(item.type==0){
-        //       this.keyword=item.name;
-        //    }else if(item.type==1){
-        //       if(item.id==20){
-        //         $this.ctypeList[0].checked=true;
-        //       }else if(item.id==30){
-        //         $this.ctypeList[1].checked=true;
-        //       }else if(item.id==40){
-        //         $this.ctypeList[2].checked=true;
-        //       }
-        //    }else{ //三级分类的处理，如果一个分类选中多个，显示哪个，显示第一个，是否可以
-
-        //    }
-        // })
+        let typeCodeList=JSON.parse(hasData);
+        typeCodeList.forEach(item=>{
+           if(item.type==0){
+              this.keyword=item.name;
+           }else if(item.type==1){
+              if(item.id==20){
+                $this.ctypeList[0].checked=true;
+              }else if(item.id==30){
+                $this.ctypeList[1].checked=true;
+              }else if(item.id==40){
+                $this.ctypeList[2].checked=true;
+              }
+           }else{ //三级分类的处理，如果一个分类选中多个，显示哪个，显示第一个，是否可以
+              this.oneList.forEach(one => {
+                if(one.id == item.id && item.type == '11'){
+                  this.navTitle = [{ ...one }]
+                  one.checked = true
+                }
+                one.children.forEach(two => {
+                  if(two.id == item.id && item.type == '12'){
+                    this.navTitle = [{ ...one }, { ...two }]
+                    two.checked = true
+                   }
+                  two.children.forEach(three => {
+                    if(three.id == item.id && item.type == '13'){
+                      this.navTitle = [{ ...one }, { ...two }, { ...three }]
+                      three.checked = true
+                    }
+                  })
+                })
+              })
+          }
+        })
       }
     },
     //搜索条件
@@ -880,6 +897,7 @@ export default {
       this.threeList = [];
       this.navTitle = [];
       this.newData = false;
+      sessionStorage.removeItem(this.localSessionKey)
       this.searchData();
     },
     // 导航切换(录播课，线下课，学习项目)
@@ -1057,11 +1075,11 @@ export default {
               })
             }
             $this.oneList.push(newItem);
-            console.log(newItem);
 
 
           });
           this.loadLocalFilters();
+          this.search()
         }
       } catch (error) {
         console.log(error);