From 64df676292cd8233289a41461dbe0d6b20c857d3 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Tue, 31 May 2022 11:36:55 +0800
Subject: [PATCH 01/33] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/collectItem.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 21a6bf04..80bbe847 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -134,8 +134,8 @@ export default {
 <style lang="scss" scoped>
 .one-line-ellipsis{
   display: -webkit-box;
-  // white-space:pre-wrap;
-  word-wrap: break-word;
+  white-space:pre-wrap;
+  // word-wrap: break-word;
   word-break:break-all;
   overflow: hidden;
   text-overflow:ellipsis;

From 26e9491c360e6f9004e9b95ac6343815a0eb097a Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 31 May 2022 11:44:01 +0800
Subject: [PATCH 02/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index c35b7e45..6fc76b28 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -7,7 +7,7 @@
           <div style="display: flex;justify-content: space-around;margin-left: 20px;">
             <div class="top-nav" :class="current == 'index' ? 'current-nav' : ''"><router-link to="/index">首页</router-link></div>
             <div class="top-nav" :class="current == 'course' ? 'current-nav' : ''"><router-link to="/course">课程</router-link></div>
-            <!-- <div class="top-nav" :class="current == 'case' ? 'current-nav' : ''"><router-link to="/case">案例</router-link></div> -->
+            <div class="top-nav" :class="current == 'case' ? 'current-nav' : ''"><router-link to="/case">案例</router-link></div>
             <div class="top-nav" :class="current == 'article' ? 'current-nav' : ''"><router-link to="/article">文章</router-link></div>
             <div class="top-nav" :class="current == 'qa' ? 'current-nav' : ''"><router-link to="/qa">问答</router-link></div>
             <div class="top-nav">

From e1382f96c84a6b24071c527503ba0491e3982f29 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 31 May 2022 19:11:30 +0800
Subject: [PATCH 03/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/interactBar.vue | 34 +++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index 64933aca..8a6d12d1 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -238,21 +238,25 @@ export default {
       })
     },
     checkHas(){
-      if(this.type>0){
-        apiPraises.has(this.type,this.data.id).then(rs=>{
-          if(rs.status==200 && rs.result){
-            this.isPraise=true;
-          }else{
-            this.isPraise=false;
-          }
-        });
-        apiFavorites.has(this.type,this.data.id).then(rs=>{
-          if(rs.status==200 && rs.result){
-            this.isFavorite=true;
-          }else{
-            this.isFavorite=false;
-          }
-        })
+      if(this.type>0 && !this.readonly && this.data.id){
+        if(this.favorites){
+          apiFavorites.has(this.type,this.data.id).then(rs=>{
+            if(rs.status==200 && rs.result){
+              this.isFavorite=true;
+            }else{
+              this.isFavorite=false;
+            }
+          })
+        }
+        if(this.praises){
+          apiPraises.has(this.type,this.data.id).then(rs=>{
+            if(rs.status==200 && rs.result){
+              this.isPraise=true;
+            }else{
+              this.isPraise=false;
+            }
+          });
+        }
       }
     },
     addShare(){

From f8efaf1874f13f76f94743cec1f3b3663bb7e00f Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 31 May 2022 19:43:29 +0800
Subject: [PATCH 04/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..07e6e472
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules

From ececd71f7b12429b9f37b0e806a43868db3c92b9 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 31 May 2022 19:58:00 +0800
Subject: [PATCH 05/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/feedback/Index.vue   | 2 +-
 src/views/feedback/Manager.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/feedback/Index.vue b/src/views/feedback/Index.vue
index 6d243ca3..f54654db 100644
--- a/src/views/feedback/Index.vue
+++ b/src/views/feedback/Index.vue
@@ -185,7 +185,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .problem{
   margin: 10px;
   border: 1px solid #e4e4e4;
diff --git a/src/views/feedback/Manager.vue b/src/views/feedback/Manager.vue
index 9b422b66..fc205bef 100644
--- a/src/views/feedback/Manager.vue
+++ b/src/views/feedback/Manager.vue
@@ -186,7 +186,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .problem{
   margin: 10px;
   border: 1px solid #f0f0f0;

From eccf1a427c8189cba2a8002efb4fae4e911e34f9 Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Wed, 1 Jun 2022 10:58:08 +0800
Subject: [PATCH 06/33] =?UTF-8?q?=E6=88=91=E5=88=86=E4=BA=AB=E7=9A=84?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=92=8C=E5=88=86=E4=BA=AB=E7=BB=99=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=85=A8=E9=83=A8=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=98=AF=E5=90=A6=E5=B7=B2=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/favorites.js | 18 +++++++++++++-----
 src/api/modules/shares.js    | 29 +++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/api/modules/favorites.js b/src/api/modules/favorites.js
index 1273fcf2..165bc5c1 100644
--- a/src/api/modules/favorites.js
+++ b/src/api/modules/favorites.js
@@ -34,7 +34,7 @@ const casePageList=function(query){
 /*分页查询  收藏的文章信息
  *@param {Object} query
   @param Integer type 根据什么类型搜索，这块暂时不传
-  @param pageIndex 第几页 pageSize 每页展示多少行 
+  @param pageIndex 第几页 pageSize 每页展示多少行
   keyword：对应关键字查询
  */
 const articlePageList=function(query){
@@ -45,7 +45,7 @@ const articlePageList=function(query){
  @param Integer type 根据什么类型搜索，暂时不传
  @param pageIndex 第几页 pageSize 每页展示多少行
  keyword：对应关键字查询
- 
+
  */
 const coursePageList=function(query){
   return ajax.post('/xboe/m/favorite/mycourselist',query);
@@ -85,16 +85,23 @@ const has=function(objType,objId){
  */
 const findAll=function(query){
 	return ajax.post('/xboe/m/favorite/findAll',query);
-}	
+}
 /*
 我的收藏 全部
 @param pageIndex 第几页
 @param pageSize 每页行数
-@param keyword 关键字 
+@param keyword 关键字
  */
 const queryAll=function(query){
 	return ajax.post('/xboe/m/favorite/queryAll',query);
 }
+/**
+ * 查看是否已收藏 批量
+ * @param {问答或者文章或者课程的id数组} data
+ * */
+const isNoFavorite=function(date){
+  return ajax.postJson('/xboe/m/favorite/isNoFavorite',data);
+}
 
 export default{
     has,
@@ -107,5 +114,6 @@ export default{
     articlePageList,
     coursePageList,
     findAll,
-	queryAll
+	  queryAll,
+    isNoFavorite
 }
diff --git a/src/api/modules/shares.js b/src/api/modules/shares.js
index 9af4635a..b8677cb4 100644
--- a/src/api/modules/shares.js
+++ b/src/api/modules/shares.js
@@ -112,7 +112,7 @@ const mymearticlelist=function(query){
  */
 const updateIsRead=function(id){
 	return ajax.get(`/xboe/m/share/updateIsRead?id=${id}`);
-}	
+}
 
 /*
  撤回分享
@@ -121,6 +121,29 @@ const updateIsRead=function(id){
 const deleteshares=function(id){
 	return ajax.get(`/xboe/m/share/delete-shares?id=${id}`);
 }
+/**
+ * 我分享的全部
+ * @param pageIndex 第几页
+ * @param pageSize 每页多少行
+ * @param keyword 关键字搜索
+ * @param isRead 是否已读
+ * */
+const findMeShare=function (query){
+  return ajax.post('/xboe/m/share/findMeShare',query);
+}
+/**
+ * 分享给我的全部
+ * @param pageIndex 第几页
+ * @param pageSize 每页多少行
+ * @param keyword 关键字搜索
+ * @param isRead 是否已读
+ * */
+const findShareMe=function (query){
+  return ajax.post('/xboe/m/share/findShareMe',query);
+}
+
+/**
+ * */
  export default{
 	save,
 	has,
@@ -134,5 +157,7 @@ const deleteshares=function(id){
 	mymecourselist,
 	mymearticlelist,
 	updateIsRead,
-	deleteshares
+	deleteshares,
+  findMeShare,
+  findShareMe
 }

From eaf5685fcb78667d17d9485e0a2e9345004a4926 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 2 Jun 2022 16:42:13 +0800
Subject: [PATCH 07/33] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/cases.js        |  2 +-
 src/api/modules/dict.js         |  2 +-
 src/views/Index.vue             | 94 ++++++++++++++++++++++++++++++++-
 src/views/portal/case/Index.vue | 88 ++++++++++++++++++++++++------
 vue.config.js                   |  2 +-
 5 files changed, 168 insertions(+), 20 deletions(-)

diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index 0023e0c5..874fd257 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -3,7 +3,7 @@ import ajax from '@/utils/xajax.js'
 
 /**首页查询
  * pageSize
- * orderField
+ * orderField   
  * orderAsc
 */
 const indexList = function(query) {
diff --git a/src/api/modules/dict.js b/src/api/modules/dict.js
index b1252481..6e2b05bb 100644
--- a/src/api/modules/dict.js
+++ b/src/api/modules/dict.js
@@ -8,7 +8,7 @@
  const items=function(key){
      return ajax.get('/xboe/m/dictionary/items?key='+key);
  }
-// 修改
+// 修改       
 //@param key 对应字段后缀
 //
  // 案例的组织机构字典   org_domain   key 
diff --git a/src/views/Index.vue b/src/views/Index.vue
index d8a609ef..70f134ae 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -105,6 +105,44 @@
             </el-card>
           </div>
         </div>
+      </div>
+        <!-- 推荐案例2版 -->
+      <div class="modules">
+         <div class="modules-title">
+    
+      <span class="modules-text">推荐案例</span>
+      <span class="quyer-tag">
+      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
+      <a :class="caseList.orderType==2?'current':''" @click="changeCaseOrder(2)">最热</a>
+      </span>
+      <span class="more"><router-link to="/case">更多&nbsp;></router-link></span>
+      </div>
+      <div class="modules-list xrow" style="height: 235px;overflow: hidden;">
+         <div class="index-course xrow-course" v-for="ca in caseList.list" :key="ca.id">
+         <div  class="casetwo" :body-style="{ padding: '0px' }">
+             <div class="case-top"></div>
+             <div class="case-conent">
+                <div class="case-time">
+                    {{ca.sysCreateTime.substring(0,10)}}
+                </div>
+                <span class="case-title one-line-ellipsis">
+                    <a :href="'case/detail?id='+ca.id" target="_blank">{{ca.title}}</a>
+                </span>
+                <div class="case-text three-line-ellipsis">
+                    {{ca.content}}
+                </div>
+                <div class="case-inter">
+                  <interactBar style="width:180px" :type="3" :readonly="true" :data="ca" :shares="false" :views="false"></interactBar>
+                   
+                </div>
+             </div>
+          <div style="margin-top:48%;margin-left:20px">
+            <authorInfo :avatar="ca.authorInfo.avatar" :name="ca.authorInfo.name" :info="ca.authorInfo.orgInfo" :sex="ca.authorInfo.sex"></authorInfo></div>
+         </div>
+      </div>
+        
+      </div>
+      
       </div>
       <!-- 推荐案例 -->
       <!-- <div class="modules">
@@ -153,6 +191,7 @@
           </el-col>
         </el-row>
       </div> -->
+    
       <!-- 推荐文章 -->
       <div class="modules">
         <!--内容块-->
@@ -313,7 +352,7 @@ export default {
         list: []
       },
       caseList: {
-        num: 4,
+        num: 6,
         orderType: 2,
         list: []
       },
@@ -426,6 +465,7 @@ export default {
             let userIds = [];
             res.result.forEach(item => {
               item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null };
+              
               if (item.authorId && item.authorId != '') {
                 userIds.push(item.authorId);
               }
@@ -579,6 +619,58 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.three-line-ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+     box-sizing: border-box;
+  -webkit-line-clamp: 3;
+    word-break: break-all;
+     display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+.casetwo{
+  width: 100%;
+  height: 220px;
+  margin-bottom:15px;
+ position: relative;
+  background-color: #fff;
+  .case-top{
+    height: 70px;
+     background-image: linear-gradient(to right , #b8c7e2, #d0dcf3);
+  }
+  .case-conent{
+    width: 220px;
+    height: 160px;
+    box-shadow: 1px 1px 15px #ccc;
+    position: absolute;
+    top: 5%;
+    background-color: #fff;
+    left: 4%;
+    padding: 10px;
+    .case-time{
+      font-size: 10px;
+      color: #b1b1b1;
+      text-align: right;
+    }
+    .case-title{
+      font-size: 14px;
+      color: #333;
+      font-weight: bold;
+      margin-bottom:10px;
+    }
+    .case-text{
+      font-size: 14px;
+    color: #888888;
+    line-height: 18px;
+    margin-bottom:12px;
+    }
+    .case-inter{
+      position: absolute;
+      bottom: 5%;
+    }
+   
+  }
+}
 // .qa-dai{
 //   color: #5da1ff;
 // }
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index f9c1eabf..043950fe 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -34,11 +34,12 @@
                       <span class="item-line"></span>
                     </div>
                     <div>
-                        <el-radio-group v-model="category" size="mini" @change="search()">
+                    <el-radio-group v-model="category" size="mini" @change="search()">
                     <el-radio-button label="0">全部</el-radio-button>
-                    <el-radio-button label="1">显示事业</el-radio-button>
+                    <el-radio-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-radio-button>
+                    <!-- <el-radio-button label="1">显示事业</el-radio-button>
                     <el-radio-button label="2">传感器事业</el-radio-button>
-                    <el-radio-button label="3">智慧医工事业</el-radio-button>
+                    <el-radio-button label="3">智慧医工事业</el-radio-button> -->
                   </el-radio-group>
                     </div>
                     
@@ -58,13 +59,14 @@
                      <div>
                         <el-radio-group v-model="type2" size="mini" @change="search()">
                       <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button label="1">经营</el-radio-button>
+                      <el-radio-button v-for="item in Profess" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
+                      <!-- <el-radio-button label="1">经营</el-radio-button>
                       <el-radio-button label="2">领用</el-radio-button>
                       <el-radio-button label="3">研发</el-radio-button>
                       <el-radio-button label="4">营销</el-radio-button>
                       <el-radio-button label="5">生产技术</el-radio-button>
                       <el-radio-button label="6">信息技术</el-radio-button>
-                      <el-radio-button label="7">质量</el-radio-button>
+                      <el-radio-button label="7">质量</el-radio-button> -->
                     </el-radio-group>
                      </div>
                     </div>
@@ -155,16 +157,18 @@
                     <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
                     <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                </el-col>
-                <el-col class="center" :span="18">{{item.sysCreateUname}}</el-col>
-                <!-- <el-col class="center" :span="7">{{''}}</el-col>
-                <el-col class="center" :span="7">{{item.counts}}</el-col> -->
-              </el-row>
-            </div>
-          </el-card>
+
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+           </div>
         </div>
-         
-      </div>
       <el-row :gutter="10">
       </el-row>
       <div style="height: 50px;"></div>
@@ -198,6 +202,7 @@ import author from '@/components/Portal/authorInfo.vue';
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js';
 import apiSearchterm from "@/api/modules/searchterm.js";
+import apiDict from "@/api/modules/dict.js"
 export default {
   name: 'index',
   components: { portalHeader, portalFooter, portalFloatTools, interactBar,timeShow ,author},
@@ -219,6 +224,12 @@ export default {
         list:[]
       },
       ankingList:[],
+
+      Popularity:[],
+      Positive:[],
+      domain:[],
+      Profess:[],
+      optionsList: [], //分类数据
       protocolDialogVisible: false,
       protocolConfirmButton:true,
       queryCondition:{
@@ -243,8 +254,12 @@ export default {
       this.protocolDialogVisible = true;
     }
     this.keyWord = this.$route.query.keyword;
-    this.getAnkingData()
-    this.searchterm()
+    this.getAnkingData();
+    this.getPopularity();
+    this.searchterm();
+    this.getPositive();
+    this.getProfess();
+    this.getdomain();
     this.getCaseData();
     window.addEventListener(
       "scroll",
@@ -264,6 +279,24 @@ export default {
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
+    getdomain(){
+     let key ='org_domain'
+      apiDict.items(key).then(res =>{
+        if(res.status==200){
+         //  console.log(res)
+           this.domain = res.result
+        }
+      })
+    },
+     getProfess(){
+     let key ='major_type'
+      apiDict.items(key).then(res =>{
+        if(res.status==200){
+          console.log(res)
+          this.Profess = res.result
+        }
+      })
+    },
     emitInput(val) {
       this.keyWord=val;
       this.search()
@@ -382,6 +415,29 @@ export default {
           this.ankingList=res.result
         }
       })
+
+   
+    },
+    getPopularity(){
+      apiCase.queryPraises(5).then(res=>{
+        if(res.status==200){
+          this.Popularity=res.result
+       
+        }
+      })
+    },
+    getPositive(){
+      apiCase.queryComments(5).then(res=>{
+        if(res.status==200){
+          this.Positive=res.result
+       
+        }
+      })
+    },
+
+    jumpRouter(item){
+        this.$router.push(`/case/detail?id=${item.id}`);
+
     }
   }
 };
diff --git a/vue.config.js b/vue.config.js
index bfa2bd30..f69b259d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -113,7 +113,7 @@ module.exports = {
         proxy: {
             '/systemapi': {
                 // 目标代理服务器地址
-                target: 'http://127.0.0.1:9090',
+                target: 'http://192.168.0.10:9090',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,

From 2181df3903472f0615dd43d4b162a866ab0f7f30 Mon Sep 17 00:00:00 2001
From: 86182 <bjy18234674226@163.com>
Date: Thu, 2 Jun 2022 18:42:15 +0800
Subject: [PATCH 08/33] =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=9A=84=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/shares.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/api/modules/shares.js b/src/api/modules/shares.js
index b8677cb4..07b5dfb7 100644
--- a/src/api/modules/shares.js
+++ b/src/api/modules/shares.js
@@ -142,6 +142,26 @@ const findShareMe=function (query){
   return ajax.post('/xboe/m/share/findShareMe',query);
 }
 
+/**
+ * 我分享的案例
+ * @param pageIndex 第几页
+ * @param pageSize 每页多少行
+ * @param isRead 是否已读
+ * @param keyword 关键字搜索
+ * */
+const myCaseList=function (query){
+  return ajax.post('/xboe/m/share/myCaseList',query);
+}
+/**
+ * 分享给我的案例
+ * @param pageIndex 第几页
+ * @param pageSize 每页多少行
+ * @param isRead 是否已读
+ * @param keyword 关键字搜索
+ * */
+const myMeCaseList=function (query){
+  return ajax.post('/xboe/m/share/myMeCaseList',query);
+}
 /**
  * */
  export default{
@@ -159,5 +179,7 @@ const findShareMe=function (query){
 	updateIsRead,
 	deleteshares,
   findMeShare,
-  findShareMe
+  findShareMe,
+  myCaseList,
+  myMeCaseList
 }

From 9d19ad09df674bbbccc6c968298b0d26c0d878fe Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 2 Jun 2022 19:50:08 +0800
Subject: [PATCH 09/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/comments.vue |  6 +++---
 src/views/Index.vue                |  2 +-
 src/views/portal/case/Detail.vue   |  4 ++--
 src/views/portal/case/Index.vue    | 17 +++++++++++------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index 4c271309..31092a0e 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -4,12 +4,12 @@
       <div v-if="showTop" class="comments-top">
           <div class="comments-top-left">评论 <span style="color: #797979;">{{total}}条</span>
               <el-checkbox v-if="objType ==2" class="btn" v-model="value" type="primary">只看作者</el-checkbox>
-              <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{value?'查看所有':'只看案主'}}</el-checkbox>
+              <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{value?'查看所有':'只看案主 @案主可以给他发私信哦'}}</el-checkbox>
           </div>
-          <div class="comments-top-right" v-if="objType !==2">
+          <!-- <div class="comments-top-right" v-if="objType !==2">
               <span @click="showList(false)" v-if="listShow">收起<i class="el-icon-arrow-down"></i></span>
               <span @click="showList(true)" v-else >打开<i class="el-icon-arrow-up"></i></span>
-          </div>
+          </div> -->
       </div>
       <div class="comments-input" v-if="!readonly">
       <div class="grid-content bg-purple">
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 70f134ae..6ba1da38 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -136,7 +136,7 @@
                    
                 </div>
              </div>
-          <div style="margin-top:48%;margin-left:20px">
+          <div style="margin-top:48%;margin-left:20px;height:40px">
             <authorInfo :avatar="ca.authorInfo.avatar" :name="ca.authorInfo.name" :info="ca.authorInfo.orgInfo" :sex="ca.authorInfo.sex"></authorInfo></div>
          </div>
       </div>
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 9842651a..bf50175b 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -17,8 +17,8 @@
               <span>作者：{{ authorInfo.name }}</span>
               <span>工号：{{ authorInfo.code }}</span>
               <span>部门：{{ authorInfo.orgInfo }}</span>
-              <span>案例编号：{{ caseDetail.id }}</span>
-              <span>发布时间：{{ caseDetail.sysCreateTime }}</span>
+              <!-- <span>案例编号：{{ caseDetail.id }}</span> -->
+              <span>{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
               <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="false"></interactBar>
             </div>
             <div class="btn-div">
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 043950fe..88c82ef0 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -73,9 +73,9 @@
                    
                   </el-col>
                 </el-row>
-                <el-row class="search-item">
+                <!-- <el-row class="search-item">
                   <el-col :span="24">
-                    <!-- <div class="item-title">应用场景</div> -->
+                    <div class="item-title">应用场景</div>
                     <div style="margin-top:10px; display: flex;">
                         <div style="line-height: 25px;">
                     <span class="item-title" style="padding-right: 5px;">专业领域</span>
@@ -92,7 +92,7 @@
                     </div>
                     
                   </el-col>
-                </el-row>
+                </el-row> -->
               </div>
               <!-- <el-row class="search-div-more">
                 <el-col :span="24">
@@ -104,8 +104,8 @@
             
             <el-row class="order-div">
               <span class="quyer-tag">
-                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">时间最近</el-button>
-                <el-button type="text" class="order-class" @click="searchData('praises')" :class="{ actice: queryCondition.orderField == 'praises' }">热度最高</el-button>
+                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
+                <el-button type="text" class="order-class" @click="searchData('praises')" :class="{ actice: queryCondition.orderField == 'praises' }">最热</el-button>
                 <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
               </span>
               <!-- <span v-if="isFind" style="padding-left:10px;">本次搜索出 {{caseList.count}} 条结果</span> -->
@@ -125,9 +125,14 @@
                         </div>
                       </router-link>
                     </div>
+                    <router-link :to="'/case/detail?id='+item.id">
                     <div class="case-info-summary" >
-                      {{item.content}}
+                      
+                              {{item.content}}
+                     
+                     
                     </div>
+                     </router-link>
                     <div style="display: flex;justify-content: space-between;">
                       <div><author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author> </div>
                       <div><interactBar :type="0" :shares="false" :views="false" :data="item" :readonly="false"></interactBar> </div>

From 3ae76c4a75ed2c764ffc3944774f62bf0634727c Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 09:22:59 +0800
Subject: [PATCH 10/33] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=B4=E9=83=A8=E6=A1=88=E4=BE=8B=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TopNav/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index 5b473688..e7c7bfc0 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -9,7 +9,7 @@
         <div class="xtop-nav">
           <div><a :href="`${webBaseUrl}/index`">首页</a></div>
           <div><a :href="`${webBaseUrl}/course`">课程</a></div>
-          <!-- <div><a :href="`${webBaseUrl}/case`" target="_blank">案例</a></div> -->
+          <div><a :href="`${webBaseUrl}/case`" target="_blank">案例</a></div>
           <div><a :href="`${webBaseUrl}/article`">文章</a></div>
           <div><a :href="`${webBaseUrl}/qa`">问答</a></div>
           <div>

From 72e27633885c713fa886b09bb71e204b85a60e92 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 09:42:44 +0800
Subject: [PATCH 11/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PdfPreview/view.vue | 199 +++++++++++++++++++++++++++++
 src/views/portal/case/Detail.vue   |  10 +-
 2 files changed, 205 insertions(+), 4 deletions(-)
 create mode 100644 src/components/PdfPreview/view.vue

diff --git a/src/components/PdfPreview/view.vue b/src/components/PdfPreview/view.vue
new file mode 100644
index 00000000..c9d03b34
--- /dev/null
+++ b/src/components/PdfPreview/view.vue
@@ -0,0 +1,199 @@
+<template><!--pdf连接分页处理-->
+  <div class="pdf-perView" id="pdf-perView">
+    <div class="pdf-box">
+      <transition name="progress">
+        <el-progress v-if="showProgress" :percentage="Math.floor(loadedRatio * 100)" :text-inside="true" :show-text="false"></el-progress>
+      </transition>
+      <pdf
+      			v-for="i in showPages"
+      			:key="i"
+      			:src="src"
+      			:page="i"
+            @progress="loadedRatio = $event"
+            @page-loaded="loadedPageHandle"
+            @loaded="loadPdfHandle"
+      			style="display: inline-block; width:100%">
+            <div>每行的间隔内容</div>
+      </pdf>
+      <!-- <pdf
+        ref="pdf"
+        :src="pdfUrl"
+        :page="currentPage"
+        @progress="loadedRatio = $event"
+        @num-pages="pageCount = $event"
+        @page-loaded="currentPage = $event"
+        @loaded="loadPdfHandler"
+        @link-clicked="currentPage = $event">
+      </pdf> -->
+    </div>
+    <div v-if="totalPages>initNum" class="pdf-footer" >
+      <!-- <el-button icon="el-icon-arrow-left" @click="prePage('footer')" :disabled="loadedRatio !== 1"></el-button>
+      <span v-if="loadedRatio !== 1" style="margin:0 10px;">0 / 0</span>
+      <span v-else style="margin:0 10px;">{{ currentPage }} / {{ pageCount }}</span>
+      <el-button @click="nextPage('footer')" :disabled="loadedRatio !== 1" icon="el-icon-arrow-right"></el-button> -->
+      <el-button type="primary" @click="clickMore()">加载更多</el-button>
+    </div>
+  </div>
+</template>
+
+<script >
+import pdf from "vue-pdf";
+export default {
+  components: { pdf },
+  props: {
+    filePath: {
+      type: String,
+      default: "",
+    },
+    scrollToID: {
+      type: String,
+      default: "pdf-perView",
+    },
+    autoScroll: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      src: "",
+      showPages: undefined,
+      totalPages:0,
+      initNum:3,
+      scale: 100, //放大系数
+      loadedRatio:0,// 加载进度
+      showProgress:true,
+    };
+  },
+  mounted() {
+      // /case/demo.pdf
+      if(this.filePath){
+        this.loadInitPdf(this.filePath);
+      }
+  },
+  watch:{
+    filePath(newVal){
+      if(newVal){
+       this.loadInitPdf(newVal);
+      }
+    },
+    loadedRatio(newVal){
+      // 直接使用loadedRatio控制进度条没有加载效果
+      if(newVal == 1){
+        let that = this;
+        setTimeout(function(){
+          that.showProgress = false;
+        }, 500)
+      }
+    }
+  },
+  methods: {
+    loadProgress(e){
+      console.log(e,'loadProgress');
+    },
+    loadedPageHandle(e){
+      console.log(e,'loadedPageHandle');
+    },
+    loadPdfHandle(e){
+      console.log(e,'loadPdfHandle');
+    },
+    clickMore(){
+       if(this.totalPages>this.showPages){
+           this.showPages++;
+       }
+    },
+    //加载页面
+    loadInitPdf(url) {
+      if(url && url.indexOf('.pdf')>-1){
+        let loadingTask = pdf.createLoadingTask(url);
+        this.src=loadingTask;
+        loadingTask.promise.then((pdf) =>{
+            this.totalPages=pdf.numPages;
+            if(pdf.numPages>this.initNum){
+              this.showPages = this.initNum;
+            }else{
+              this.showPages =pdf.numPages;
+            }
+          }).catch((err) =>{
+            this.$message.error("加载内容失败,请联系管理员");
+          });
+      }
+    },
+    initSrc(url){
+      if(url && url.indexOf('.pdf')>-1){
+        //this.src = url;
+      }
+    },
+    prePage(type) {
+      if (this.currentPage > 1) {
+        this.currentPage--;
+        if(type === 'footer'){
+          this.scrollTo();
+        }
+      }
+    },
+    nextPage(type) {
+      if (this.currentPage < this.pageCount) {
+        this.currentPage++;
+        if(type === 'footer'){
+          this.scrollTo();
+        }
+      }
+    },
+    scrollTo(){
+      if(!this.autoScroll){
+        return;
+      }
+      document.getElementById(this.scrollToID).scrollIntoView({ block: 'start', behavior: 'smooth' })
+    },
+    //放大
+    scaleD() {
+      if (this.scale == 200) {
+        return;
+      }
+      this.scale += 5;
+      this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%";
+    },
+    //缩小
+    scaleX() {
+      if (this.scale == 50) {
+        return;
+      }
+      this.scale += -5;
+      this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%";
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.pdf-perView {
+  .pdf-box {
+    min-height: 300px;
+    width: 100%;
+    //border: 1px solid #dfdfdf;
+    overflow-y: hidden;
+    overflow-x: hidden;
+    >span{
+      margin-bottom: 20px;
+    }
+  }
+  .pdf-header,.pdf-footer {
+    //border: 1px solid #dfdfdf;
+    //background: #dfdfdf;
+    text-align: center;
+    line-height: 40px;
+  }
+  /* ------------------- 进度条 ------------------- */
+  //类名：隐藏到显示过程所需要的时间
+  .progress-leave-active{
+    transition: opacity 2s;
+  }
+  .progress-leave-to{
+    opacity: 0;
+  }
+  .el-progress .el-progress-bar .el-progress-bar__outer{
+    background-color: #FFFFFF;
+  }
+}
+</style>
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index bf50175b..30659aad 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -18,7 +18,7 @@
               <span>工号：{{ authorInfo.code }}</span>
               <span>部门：{{ authorInfo.orgInfo }}</span>
               <!-- <span>案例编号：{{ caseDetail.id }}</span> -->
-              <span>{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
+              <span v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
               <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="false"></interactBar>
             </div>
             <div class="btn-div">
@@ -31,7 +31,7 @@
             <!-- <div class="content">
               {{ caseDetail.content }}
             </div> -->
-            <pdfPreview :filePath="basePath+caseDetail.filePath"></pdfPreview>
+            <pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview>
           </el-card>
           <!-- :authorId="articleDetailData.sysCreateAid" -->
           <el-row><comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.sysCreateAid"></comments></el-row>
@@ -70,7 +70,7 @@
 import { mapGetters } from 'vuex';
 import portalHeader from '@/components/PortalHeader.vue';
 import portalFooter from '@/components/PortalFooter.vue';
-import pdfPreview from '@/components/PdfPreview/index.vue';
+import pdfPreview from '@/components/PdfPreview/view.vue';
 
 import interactBar from '@/components/Portal/interactBar.vue';
 import comments from '@/components/Portal/comments.vue';
@@ -88,6 +88,7 @@ export default {
     return {
       resolveId: '',
       basePath:process.env.VUE_APP_FILE_BASE_URL,
+      pdfPath:'',
       caseDetail: {
         id:'',
         filePath:''
@@ -124,8 +125,9 @@ export default {
     },
     getCaseUserDetail() {
       apiUser.getByIds([this.caseDetail.sysCreateAid]).then(res => {
-        if (res.status == 200) {
+        if (res.status == 200 && res.result.length>0) {
           this.authorInfo = res.result[0];
+          //console.log(res.result,'res.result');
         }
       });
     },

From f2d66a8a579fc63a8c481a9ae6ebe766e2efafe0 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 10:23:38 +0800
Subject: [PATCH 12/33] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PdfPreview/view.vue | 5 -----
 src/views/portal/case/Detail.vue   | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/PdfPreview/view.vue b/src/components/PdfPreview/view.vue
index c9d03b34..1062f1d5 100644
--- a/src/components/PdfPreview/view.vue
+++ b/src/components/PdfPreview/view.vue
@@ -119,11 +119,6 @@ export default {
           });
       }
     },
-    initSrc(url){
-      if(url && url.indexOf('.pdf')>-1){
-        //this.src = url;
-      }
-    },
     prePage(type) {
       if (this.currentPage > 1) {
         this.currentPage--;
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 30659aad..f6397591 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -98,6 +98,7 @@ export default {
     };
   },
   mounted() {
+    this.pdfPath=this.basePath+'/case/demo.pdf';
     this.resolveId = this.$route.query.id;
     if (this.resolveId) {
       this.getCaseData();
@@ -197,7 +198,7 @@ export default {
 .jianjie {
   margin: 15px 0;
   background-color: #fff;
-  padding: 20px 100px 10px 100px;
+  padding: 0px 0px 10px 0px;
   .content {
     padding: 10px 0;
     line-height: 25px;

From a0177e2493a5f83f8e92021fc9cf4d5988ede0b4 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 10:24:54 +0800
Subject: [PATCH 13/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..07e6e472
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules

From ef7822ef21aecb2539effb8dc5e7b4fd4fcc399d Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 10:48:21 +0800
Subject: [PATCH 14/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index f6397591..36899399 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -98,7 +98,7 @@ export default {
     };
   },
   mounted() {
-    this.pdfPath=this.basePath+'/case/demo.pdf';
+    //this.pdfPath=this.basePath+'/case/demo1.pdf';
     this.resolveId = this.$route.query.id;
     if (this.resolveId) {
       this.getCaseData();
@@ -120,6 +120,12 @@ export default {
           if (JSON.stringify(res.result) != '{}') {
             this.caseDetail = res.result;
             this.getCaseUserDetail();
+            if(this.caseDetil.filePath){
+               this.pdfPath=this.basePath+this.caseDetil.filePath;
+            }else{
+               this.$message.error('内容文件不存在或已被删除，请与管理员联系');
+            }
+            
           }
         }
       });

From e8d237d8627e86101eb4599c5c42397ba5945482 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Mon, 6 Jun 2022 10:50:38 +0800
Subject: [PATCH 15/33] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue | 2 +-
 src/views/portal/case/Index.vue  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 36899399..a0df73c7 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -19,7 +19,7 @@
               <span>部门：{{ authorInfo.orgInfo }}</span>
               <!-- <span>案例编号：{{ caseDetail.id }}</span> -->
               <span v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
-              <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="false"></interactBar>
+              <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
             </div>
             <div class="btn-div">
               <span class="item">角色认知</span>
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 88c82ef0..8a6c188d 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -104,8 +104,9 @@
             
             <el-row class="order-div">
               <span class="quyer-tag">
-                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
-                <el-button type="text" class="order-class" @click="searchData('praises')" :class="{ actice: queryCondition.orderField == 'praises' }">最热</el-button>
+                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最热</el-button>
+                <el-button type="text" class="order-class" @click="searchData('praises')" :class="{ actice: queryCondition.orderField == 'praises' }">最新</el-button>
+
                 <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
               </span>
               <!-- <span v-if="isFind" style="padding-left:10px;">本次搜索出 {{caseList.count}} 条结果</span> -->
@@ -129,8 +130,7 @@
                     <div class="case-info-summary" >
                       
                               {{item.content}}
-                     
-                     
+
                     </div>
                      </router-link>
                     <div style="display: flex;justify-content: space-between;">

From 596af21fa8ecd0bda9f0f73b29919c63b96a5cb9 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Mon, 6 Jun 2022 17:56:36 +0800
Subject: [PATCH 16/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue | 200 +++++++++++++++++++++++++-----
 src/views/portal/case/Index.vue  | 201 +++++++++++++++++++++++++++----
 2 files changed, 350 insertions(+), 51 deletions(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index a0df73c7..b5c45e60 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div id="case-list-content">
     <portal-header current="case" :goSearch="2"></portal-header>
     <div class="portal-content xcontent" style="margin-top: 30px;">
        <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
@@ -38,28 +38,83 @@
         </el-col>
       </el-row>
           </div>
-          <div style="width: 245px;margin-left: 10px;"><!--排行榜-->
-            <div id="fixd-box">
-               <el-card class="ranking-card">
-                 <div slot="header">
-                   <span>排行榜</span>
-                 </div>
-                 <div>
-                   <el-row class="ranking-title" v-for="(item,index) in ankingList" :key="index">
-                     <el-col :span="6">
-                         <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                         <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                         <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                     </el-col>
-                     <el-col class="center" :span="18">{{item.sysCreateUname}}</el-col>
-                     <!-- <el-col class="center" :span="7">{{''}}</el-col>
-                     <el-col class="center" :span="7">{{item.counts}}</el-col> -->
-                   </el-row>
-                 </div>
-               </el-card>
-            </div>
-
-          </div>
+          <div style="width: 245px;margin-left: 5px;">
+        <div>
+           <div id="fixd-box">
+             <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.sysCreateUname" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+                <div style="height: 10px;"></div>
+              <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in Popularity" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+             <div style="height: 10px;"></div>
+              <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in Positive" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+           </div>
+        </div>
+      </div>
       </div>
     </div>
     <portal-footer></portal-footer>
@@ -77,7 +132,8 @@ import comments from '@/components/Portal/comments.vue';
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js';
 import author from '@/components/Portal/authorInfo.vue';
-import apiMessage from '@/api/system/message.js'
+import apiMessage from '@/api/system/message.js';
+import apiDict from "@/api/modules/dict.js"
 export default {
   name: 'atticle',
   components: { portalHeader, portalFooter, interactBar, author, comments,pdfPreview },
@@ -86,6 +142,9 @@ export default {
   },
   data() {
     return {
+       ankingList:[],
+      Popularity:[],
+      Positive:[],
       resolveId: '',
       basePath:process.env.VUE_APP_FILE_BASE_URL,
       pdfPath:'',
@@ -104,24 +163,70 @@ export default {
       this.getCaseData();
     }
     this.getAnkingData();
-
+    this.getPopularity(); 
+     this.getPositive();
+     window.addEventListener(
+      "scroll",
+      this.handleScroll
+    );
   },
   methods: {
-    getAnkingData(){
-      apiCase.usernameList(10).then(res=>{
+
+
+
+    handleScroll() {
+        let innerHeight = document.querySelector('#case-list-content').clientHeight
+        let outerHeight = document.documentElement.clientHeight
+        let scrollTop = document.documentElement.scrollTop
+        if ((outerHeight + scrollTop + 350) >= innerHeight) {
+          if(this.moreState == 1 && this.course.pageIndex < 4) {
+              this.loadMore();
+          }
+        }
+        if(scrollTop > 630) {
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:245.5px";
+        } else {
+          document.querySelector('#fixd-box').style.cssText = "position: static";
+        }
+    },
+
+   getAnkingData(){
+      apiCase.usernameList(5).then(res=>{
         if(res.status==200){
           this.ankingList=res.result
+        //  console.log(res)
         }
       })
     },
+    getPopularity(){
+      apiCase.queryPraises(5).then(res=>{
+        if(res.status==200){
+          this.Popularity=res.result
+          // console.log(this.Popularity)
+        }
+      })
+    },
+    getPositive(){
+      apiCase.queryComments(5).then(res=>{
+        if(res.status==200){
+          this.Positive=res.result
+           console.log(res)
+        }
+      })
+    },
+
+
+   
     getCaseData() {
       apiCase.detail(this.resolveId,true).then(res => {
         if (res.status == 200) {
+         
           if (JSON.stringify(res.result) != '{}') {
             this.caseDetail = res.result;
+            console.log(this.caseDetail.filePath)
             this.getCaseUserDetail();
-            if(this.caseDetil.filePath){
-               this.pdfPath=this.basePath+this.caseDetil.filePath;
+            if(this.caseDetail.filePath){
+               this.pdfPath=this.basePath+this.caseDetail.filePath;
             }else{
                this.$message.error('内容文件不存在或已被删除，请与管理员联系');
             }
@@ -159,6 +264,43 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-card__body{
+  padding: 0;
+}
+::v-deep .bacolor:nth-child(odd){
+  background-color: #f6f6f6;
+  padding: 0 5px;
+}
+::v-deep .bacolor:nth-child(even){
+  background-color:  #fff;
+  padding: 0 5px;
+
+}
+.ranking-title {
+     line-height: 34px;
+    font-size: 15px;
+    color: #333333;
+    .center-titlt{
+      font-size: 15px;
+      color: #333333;
+    }
+    .center{
+      text-align: right;
+    }
+    img{
+      margin-top: 5px;
+    }
+  }
+  ::v-deep .title-line-ellipsis{
+  // width: 100%;
+   display: -webkit-box;
+   overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  box-sizing: border-box;
+  word-break:break-all;
+}
 .nav {
   margin-bottom: 10px;
 }
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 8a6c188d..6b1b7984 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -29,11 +29,11 @@
                 <el-col :span="24">
                   <!-- <div class="item-title">组织领域</div> -->
                   <div style="margin-top:10px; display: flex;">
-                     <div style="line-height: 25px;">
+                     <div style="line-height: 25px;width:11.5%">
                       <span class="item-title" style="padding-right: 5px;">组织领域</span>
                       <span class="item-line"></span>
                     </div>
-                    <div>
+                    <div style="flex:1;">
                     <el-radio-group v-model="category" size="mini" @change="search()">
                     <el-radio-button label="0">全部</el-radio-button>
                     <el-radio-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-radio-button>
@@ -52,14 +52,15 @@
                   <el-col :span="24">
                     <!-- <div class="item-title">专业领域</div> -->
                     <div style="margin-top:10px; display: flex;">
-                      <div style="line-height: 25px;">
+                      <div style="line-height: 25px;width:11.5%">
                     <span class="item-title" style="padding-right: 5px;">专业分类</span>
                     <span class="item-line"></span>
                      </div>
-                     <div>
+                     <div style="flex:1" id="searchBox"> 
                         <el-radio-group v-model="type2" size="mini" @change="search()">
                       <el-radio-button label="0">全部</el-radio-button>
                       <el-radio-button v-for="item in Profess" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
+                     
                       <!-- <el-radio-button label="1">经营</el-radio-button>
                       <el-radio-button label="2">领用</el-radio-button>
                       <el-radio-button label="3">研发</el-radio-button>
@@ -69,6 +70,7 @@
                       <el-radio-button label="7">质量</el-radio-button> -->
                     </el-radio-group>
                      </div>
+                     
                     </div>
                    
                   </el-col>
@@ -94,6 +96,13 @@
                   </el-col>
                 </el-row> -->
               </div>
+              <div class="searBox">
+                 <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
+                      {{word}}
+                     <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
+                </el-button>
+              </div>
+               
               <!-- <el-row class="search-div-more">
                 <el-col :span="24">
                   <el-button type="text" @click="queryExpand = true" v-if="!queryExpand">收起</el-button>
@@ -150,19 +159,71 @@
         </el-col>
          </el-row>
       </div>
-      <div style="width: 245px;margin-left: 5px;">
-        <div id="fixd-box">
-           <el-card class="ranking-card">
-            <div slot="header">
-              <span>排行榜</span>
-            </div>
-            <div>
-              <el-row class="ranking-title" v-for="(item,index) in ankingList" :key="index">
-                <el-col :span="6">
+       <div style="width: 245px;margin-left: 5px;">
+        <div>
+           <div id="fixd-box">
+             <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.sysCreateUname" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+                <div style="height: 10px;"></div>
+              <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in Popularity" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+             <div style="height: 10px;"></div>
+              <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in Positive" :key="index" >
+                  <el-col :span="6" style="height:34px">
                     <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
                     <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-
                     <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
                   </el-col>
                   <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
@@ -174,6 +235,8 @@
             </el-card>
            </div>
         </div>
+      </div>
+
       <el-row :gutter="10">
       </el-row>
       <div style="height: 50px;"></div>
@@ -213,6 +276,14 @@ export default {
   components: { portalHeader, portalFooter, portalFloatTools, interactBar,timeShow ,author},
   computed: {
     ...mapGetters(['userInfo','portalCase']),
+     word: function() {
+      if (this.showAll == false) {
+        //对文字进行处理
+        return "展开搜索";
+      } else {
+        return "收起搜索";
+      }
+    },
     isMore() {
       let isOk = true;
     if(this.caseList.list.length === this.caseList.count) {
@@ -223,13 +294,13 @@ export default {
   },
   data() {
     return {
+       showAll:true,//是否展开全部
       searchRecords:[],
       caseList:{
         count:0,
         list:[]
       },
       ankingList:[],
-
       Popularity:[],
       Positive:[],
       domain:[],
@@ -254,7 +325,11 @@ export default {
       searchTags: []
     };
   },
+  
   mounted() {
+    this.$nextTick(function() {
+      this.closeSearch();
+    });
     if(!this.portalCase.readProtocol){
       this.protocolDialogVisible = true;
     }
@@ -271,6 +346,7 @@ export default {
       this.handleScroll
     );
   },
+
   watch:{
     // queryCondition:{
     //   handler(newValue,oldValue){
@@ -284,6 +360,43 @@ export default {
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
+
+    closeSearch() {
+      this.showAll = !this.showAll;
+      var searchBoxHeght = document.getElementById("searchBox");
+      if (this.showAll == false) {
+        searchBoxHeght.style.height = 60 + "px";
+      } else {
+        searchBoxHeght.style.height = "auto";
+      }
+    },
+
+  getAnkingData(){
+      apiCase.usernameList(5).then(res=>{
+        if(res.status==200){
+          this.ankingList=res.result
+        //  console.log(res)
+        }
+      })
+    },
+    getPopularity(){
+      apiCase.queryPraises(5).then(res=>{
+        if(res.status==200){
+          this.Popularity=res.result
+          // console.log(this.Popularity)
+        }
+      })
+    },
+    getPositive(){
+      apiCase.queryComments(5).then(res=>{
+        if(res.status==200){
+          this.Positive=res.result
+           console.log(res)
+        }
+      })
+    },
+
+
     getdomain(){
      let key ='org_domain'
       apiDict.items(key).then(res =>{
@@ -314,13 +427,13 @@ export default {
         let innerHeight = document.querySelector('#case-list-content').clientHeight
         let outerHeight = document.documentElement.clientHeight
         let scrollTop = document.documentElement.scrollTop
-        // if ((outerHeight + scrollTop + 350) >= innerHeight) {
-        //   if(this.moreState == 1 && this.course.pageIndex < 4) {
-        //       this.loadMore();
-        //   }
-        // }
-        if(scrollTop > 100) {
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: 0;width:245px";
+        if ((outerHeight + scrollTop + 350) >= innerHeight) {
+          if(this.moreState == 1 && this.course.pageIndex < 4) {
+              this.loadMore();
+          }
+        }
+        if(scrollTop > 630) {
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:245.5px";
         } else {
           document.querySelector('#fixd-box').style.cssText = "position: static";
         }
@@ -449,6 +562,50 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.searBox{
+  text-align: center;
+  margin:  10px auto 0 auto;
+}
+#searchBox {
+  overflow: hidden;
+}
+.ranking-title {
+     line-height: 34px;
+    font-size: 15px;
+    color: #333333;
+    .center-titlt{
+      font-size: 15px;
+      color: #333333;
+    }
+    .center{
+      text-align: right;
+    }
+    img{
+      margin-top: 5px;
+    }
+  }
+::v-deep .title-line-ellipsis{
+  // width: 100%;
+   display: -webkit-box;
+   overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  box-sizing: border-box;
+  word-break:break-all;
+}
+::v-deep .el-card__body{
+  padding: 0;
+}
+::v-deep .bacolor:nth-child(odd){
+  background-color: #f6f6f6;
+  padding: 0 5px;
+}
+::v-deep .bacolor:nth-child(even){
+  background-color:  #fff;
+  padding: 0 5px;
+
+}
 ::v-deep .el-card{
   border: none;
   border-radius: 0px;

From 5db7a90ee45307cd6d6e754a57033cc408a92e5a Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Mon, 6 Jun 2022 18:27:26 +0800
Subject: [PATCH 17/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 6b1b7984..772006cc 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -365,7 +365,7 @@ export default {
       this.showAll = !this.showAll;
       var searchBoxHeght = document.getElementById("searchBox");
       if (this.showAll == false) {
-        searchBoxHeght.style.height = 60 + "px";
+        searchBoxHeght.style.height = 70 + "px";
       } else {
         searchBoxHeght.style.height = "auto";
       }
@@ -564,7 +564,7 @@ export default {
 <style scoped lang="scss">
 .searBox{
   text-align: center;
-  margin:  10px auto 0 auto;
+  margin:  0px auto 0 auto;
 }
 #searchBox {
   overflow: hidden;

From ea5d9ab00ea70479ebf6e765c4f4965ba0553c02 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Mon, 6 Jun 2022 18:56:44 +0800
Subject: [PATCH 18/33] =?UTF-8?q?=E6=A1=88=E4=BE=8Bpdf=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PdfPreview/view.vue | 76 +++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 7 deletions(-)

diff --git a/src/components/PdfPreview/view.vue b/src/components/PdfPreview/view.vue
index 1062f1d5..6f25b874 100644
--- a/src/components/PdfPreview/view.vue
+++ b/src/components/PdfPreview/view.vue
@@ -31,7 +31,7 @@
       <span v-if="loadedRatio !== 1" style="margin:0 10px;">0 / 0</span>
       <span v-else style="margin:0 10px;">{{ currentPage }} / {{ pageCount }}</span>
       <el-button @click="nextPage('footer')" :disabled="loadedRatio !== 1" icon="el-icon-arrow-right"></el-button> -->
-      <el-button type="primary" @click="clickMore()">加载更多</el-button>
+      <el-button type="primary" @click="clickMore()"  v-if="moreState == 1">加载更多</el-button>
     </div>
   </div>
 </template>
@@ -63,6 +63,9 @@ export default {
       scale: 100, //放大系数
       loadedRatio:0,// 加载进度
       showProgress:true,
+      moreState:1,// 1 加载更多 2 加载中 3无数据
+     isscroll:false,
+     pdfpage:0,
     };
   },
   mounted() {
@@ -70,6 +73,13 @@ export default {
       if(this.filePath){
         this.loadInitPdf(this.filePath);
       }
+      window.addEventListener(
+      "scroll",
+      this.handleScroll
+    );
+  },
+  beforeDestroy(){
+    window.removeEventListener("scroll",this.handleScroll);
   },
   watch:{
     filePath(newVal){
@@ -89,36 +99,88 @@ export default {
   },
   methods: {
     loadProgress(e){
-      console.log(e,'loadProgress');
+       console.log(e,'loadProgress');
     },
     loadedPageHandle(e){
-      console.log(e,'loadedPageHandle');
+       console.log(e,'loadedPageHandle');
+       this.pdfpage = e;
+
     },
     loadPdfHandle(e){
-      console.log(e,'loadPdfHandle');
+       console.log(e,'loadPdfHandle');
     },
     clickMore(){
        if(this.totalPages>this.showPages){
-           this.showPages++;
+          this.showPages++;
        }
-    },
+      this.isscroll = true;
+     
+    },     
     //加载页面
     loadInitPdf(url) {
+     
       if(url && url.indexOf('.pdf')>-1){
         let loadingTask = pdf.createLoadingTask(url);
         this.src=loadingTask;
+        
         loadingTask.promise.then((pdf) =>{
+           console.log(pdf)
             this.totalPages=pdf.numPages;
+          
+
             if(pdf.numPages>this.initNum){
               this.showPages = this.initNum;
-            }else{
+             
+            } else{
               this.showPages =pdf.numPages;
+            
             }
+            
+            
           }).catch((err) =>{
             this.$message.error("加载内容失败,请联系管理员");
           });
+         
       }
     },
+
+   handleScroll() {
+      let el_anking = document.querySelector('#case-list-content');
+      let innerHeight = document.querySelector('#pdf-perView').clientHeight
+      let outerHeight = document.documentElement.clientHeight
+      let scrollTop = document.documentElement.scrollTop
+     
+        if(this.isscroll){
+          this.showPages++;
+          this.debounce(this.loadInitPdf(),5000);
+          
+      }
+    //  console.log(this.pdfpage,'000')
+    // console.log(this.totalPages,this.pdfpage)
+     if(this.pdfpage >= this.totalPages){
+        this.isscroll = false
+        this.moreState = 3
+        // console.log('hcuewhf')
+     }
+        //  if(scrollTop > 400) {
+        //   document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px";
+        // } else {
+        //   document.querySelector('#articleAnking').style.cssText = "position: static";
+        // }
+  },
+   
+    
+    debounce(func, wait) {// 非立即执行
+    let timeout;
+    return function () {
+        let context = this;
+        let args = arguments;
+        if (timeout) clearTimeout(timeout);
+        timeout = setTimeout(() => {
+            func.apply(context, args)
+        }, wait);
+    }
+},
     prePage(type) {
       if (this.currentPage > 1) {
         this.currentPage--;

From f3850178fddbab84450b418b5f7bc349e973e8d9 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 14:49:07 +0800
Subject: [PATCH 19/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue              | 40 +++++++++++++++++------------
 src/views/portal/case/Detail.vue | 22 ++++++++++------
 src/views/portal/case/Index.vue  | 44 ++++++++++++++++++++------------
 3 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index 6ba1da38..850b2144 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -112,33 +112,36 @@
     
       <span class="modules-text">推荐案例</span>
       <span class="quyer-tag">
-      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
       <a :class="caseList.orderType==2?'current':''" @click="changeCaseOrder(2)">最热</a>
+      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
       </span>
       <span class="more"><router-link to="/case">更多&nbsp;></router-link></span>
       </div>
       <div class="modules-list xrow" style="height: 235px;overflow: hidden;">
          <div class="index-course xrow-course" v-for="ca in caseList.list" :key="ca.id">
          <div  class="casetwo" :body-style="{ padding: '0px' }">
-             <div class="case-top"></div>
+             <!-- <div class="case-top"></div> -->
              <div class="case-conent">
                 <div class="case-time">
                     {{ca.sysCreateTime.substring(0,10)}}
                 </div>
+                 <a :href="'case/detail?id='+ca.id" >
                 <span class="case-title one-line-ellipsis">
-                    <a :href="'case/detail?id='+ca.id" target="_blank">{{ca.title}}</a>
+                   {{ca.title}}
                 </span>
                 <div class="case-text three-line-ellipsis">
-                    {{ca.content}}
+                    {{ca.summary}}
                 </div>
+                </a>
                 <div class="case-inter">
                   <interactBar style="width:180px" :type="3" :readonly="true" :data="ca" :shares="false" :views="false"></interactBar>
                    
                 </div>
-             </div>
-          <div style="margin-top:48%;margin-left:20px;height:40px">
+                  <div style="height:40px">
             <authorInfo :avatar="ca.authorInfo.avatar" :name="ca.authorInfo.name" :info="ca.authorInfo.orgInfo" :sex="ca.authorInfo.sex"></authorInfo></div>
          </div>
+             </div>
+        
       </div>
         
       </div>
@@ -629,6 +632,7 @@ export default {
   -webkit-box-orient: vertical;
 }
 .casetwo{
+  border: 1px solid #F0F0F0;
   width: 100%;
   height: 220px;
   margin-bottom:15px;
@@ -639,34 +643,36 @@ export default {
      background-image: linear-gradient(to right , #b8c7e2, #d0dcf3);
   }
   .case-conent{
-    width: 220px;
-    height: 160px;
-    box-shadow: 1px 1px 15px #ccc;
-    position: absolute;
-    top: 5%;
+    width: 100%;
+    height: 100%;
+    // box-shadow: 1px 1px 15px #ccc;
+    // position: absolute;
+    // top: 5%;
     background-color: #fff;
-    left: 4%;
-    padding: 10px;
+    // left: 4%;
+    padding: 16px;
     .case-time{
-      font-size: 10px;
-      color: #b1b1b1;
+      font-size: 12px;
+      color: #999999;
       text-align: right;
     }
     .case-title{
+      margin-top: 10px;
       font-size: 14px;
       color: #333;
       font-weight: bold;
       margin-bottom:10px;
     }
     .case-text{
+      height: 55px;
       font-size: 14px;
     color: #888888;
     line-height: 18px;
     margin-bottom:12px;
     }
     .case-inter{
-      position: absolute;
-      bottom: 5%;
+      width: 100%;
+      border-bottom: 1px solid #f3f3f3;
     }
    
   }
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index b5c45e60..c96a70df 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -13,18 +13,19 @@
           <el-card :body-style="{ padding: '0px' }" class="detail">
             <div class="title">{{ caseDetail.title }}</div>
             <div class="label">
-              <author :onlyAvatar="true" :avatar="authorInfo.avatar" ></author>
+              <author :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
               <span>作者：{{ authorInfo.name }}</span>
               <span>工号：{{ authorInfo.code }}</span>
               <span>部门：{{ authorInfo.orgInfo }}</span>
               <!-- <span>案例编号：{{ caseDetail.id }}</span> -->
               <span v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
               <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
+              
             </div>
-            <div class="btn-div">
-              <span class="item">角色认知</span>
-              <span class="item">角色转变</span>
-              <span class="item">团队管理</span>
+            <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
+            <div class="btn-div" >
+              <span v-if="caseDetail.orgDomain" class="item">{{ caseDetail.orgDomain }}</span>
+              <span v-if="caseDetail.majorType" class="item">{{ caseDetail.majorType }}</span>
             </div>
           </el-card>
           <el-card :body-style="{ padding: '0px' }" class="jianjie">
@@ -91,7 +92,7 @@
              <div style="height: 10px;"></div>
               <el-card class="ranking-card" >
               <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">热度榜</span>
               </div>
               <div style="padding-bottom:10px">
                 <el-row class="ranking-title">
@@ -153,7 +154,7 @@ export default {
         filePath:''
       },
       ankingList:[],
-      authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '' }
+      authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null}
     };
   },
   mounted() {
@@ -184,7 +185,7 @@ export default {
           }
         }
         if(scrollTop > 630) {
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:245.5px";
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -550px;width:245.5px";
         } else {
           document.querySelector('#fixd-box').style.cssText = "position: static";
         }
@@ -264,6 +265,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.case-summary{
+  margin-top: 10px;
+  font-size: 16px;
+  color: #333;
+}
 ::v-deep .el-card__body{
   padding: 0;
 }
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 772006cc..1ff6002d 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -22,7 +22,7 @@
                 <el-tag closable>显示事业</el-tag>
                 <el-tag closable>经营</el-tag>
                 <el-tag closable>业绩提升</el-tag>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx">{{ tag.words }}</el-tag>
+                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.words }}</el-tag>
               </div>
             </div>
               <el-row class="search-item">
@@ -56,7 +56,7 @@
                     <span class="item-title" style="padding-right: 5px;">专业分类</span>
                     <span class="item-line"></span>
                      </div>
-                     <div style="flex:1" id="searchBox"> 
+                     <div style="flex:1;" id="searchBox" > 
                         <el-radio-group v-model="type2" size="mini" @change="search()">
                       <el-radio-button label="0">全部</el-radio-button>
                       <el-radio-button v-for="item in Profess" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
@@ -96,7 +96,7 @@
                   </el-col>
                 </el-row> -->
               </div>
-              <div class="searBox">
+              <div class="searBox" v-if="searchwd">
                  <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
                       {{word}}
                      <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
@@ -138,7 +138,7 @@
                     <router-link :to="'/case/detail?id='+item.id">
                     <div class="case-info-summary" >
                       
-                              {{item.content}}
+                              {{item.summary}}
 
                     </div>
                      </router-link>
@@ -212,7 +212,7 @@
              <div style="height: 10px;"></div>
               <el-card class="ranking-card" >
               <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">热度榜</span>
               </div>
               <div style="padding-bottom:10px">
                 <el-row class="ranking-title">
@@ -294,7 +294,8 @@ export default {
   },
   data() {
     return {
-       showAll:true,//是否展开全部
+      searchwd:true,
+      showAll:true,//是否展开全部
       searchRecords:[],
       caseList:{
         count:0,
@@ -360,15 +361,27 @@ export default {
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
+   
+   tagsClose(tag, index){
+
+   },
+
 
     closeSearch() {
       this.showAll = !this.showAll;
       var searchBoxHeght = document.getElementById("searchBox");
+      var searchBoxWidth = document.getElementById("searchBox");
+      // console.log(searchBoxWidth.clientWidth);
+      if(searchBoxWidth.clientWidth > 950){
+       this.searchwd = false;
+      }
       if (this.showAll == false) {
         searchBoxHeght.style.height = 70 + "px";
       } else {
         searchBoxHeght.style.height = "auto";
       }
+
+
     },
 
   getAnkingData(){
@@ -396,7 +409,6 @@ export default {
       })
     },
 
-
     getdomain(){
      let key ='org_domain'
       apiDict.items(key).then(res =>{
@@ -410,7 +422,6 @@ export default {
      let key ='major_type'
       apiDict.items(key).then(res =>{
         if(res.status==200){
-          console.log(res)
           this.Profess = res.result
         }
       })
@@ -433,7 +444,7 @@ export default {
           }
         }
         if(scrollTop > 630) {
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:245.5px";
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -550px;width:245.5px";
         } else {
           document.querySelector('#fixd-box').style.cssText = "position: static";
         }
@@ -609,6 +620,7 @@ export default {
 ::v-deep .el-card{
   border: none;
   border-radius: 0px;
+  border: 1px solid #EBEEF5;
 }
 ::v-deep .el-radio-button__inner, .el-radio-group {
      vertical-align: top;
@@ -805,17 +817,17 @@ export default {
   }
 }
 
-.right-box {
-  line-height: 25px;
-  .ranking-card {
-    margin-bottom: 10px;
-    .el-col{
-      margin-bottom: 10px;
-    }
+
+.ranking-card {
+    
+   
     .center{
       text-align: center;
     }
   }
+.right-box {
+  line-height: 25px;
+  
   .ranking-title {
   }
   .aligh-title{

From 86ef8f2f2a00561aaf89022474554077007355f4 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 15:23:14 +0800
Subject: [PATCH 20/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserCenter/menu.vue |   6 +-
 src/views/portal/case/Index.vue    | 148 ++++++++++++++---------------
 2 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 50f324f8..8ce03334 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -78,10 +78,10 @@
           <svg-icon icon-class="teather"></svg-icon>
           <span slot="title">教师管理</span>
         </el-menu-item>
-        <!-- <el-menu-item index="/case/manage" v-show="curIdentity == 3">
+        <el-menu-item index="/case/manage" v-show="curIdentity == 3">
           <svg-icon icon-class="case"></svg-icon>
           <span slot="title">案例管理</span>
-        </el-menu-item> -->
+        </el-menu-item>
         <el-menu-item index="/manage/ugroups" v-show="curIdentity == 3">
           <svg-icon icon-class="audience" style="font-size:16px"></svg-icon>
           <span slot="title">受众管理</span>
@@ -427,7 +427,7 @@ export default {
    height: 36px;
 }
 .oneheight{
- 
+
   height: 36px;
   line-height: 36px;
 }
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 1ff6002d..47b59e24 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -7,44 +7,37 @@
              <el-col :span="24">
           <el-card :body-style="{ padding: '0px' }" class="left-div">
             <el-row class="search-div">
-              <el-row>
+              <!-- <el-row>
                 <el-col :span="10" class="search-keyword">
-                  <!-- <el-input placeholder="请输入关键词搜索" v-model="keyWord" clearable><el-button slot="append" icon="el-icon-search" @click="search"></el-button></el-input> -->
-                  <!-- <div class="tip">热门搜索词：物联网 教师 辅导 绩效</div> -->
-                  <!-- <div class="tip" style="font-size: 14px;">
+                  <el-input placeholder="请输入关键词搜索" v-model="keyWord" clearable><el-button slot="append" icon="el-icon-search" @click="search"></el-button></el-input>
+                  <div class="tip">热门搜索词：物联网 教师 辅导 绩效</div>
+                  <div class="tip" style="font-size: 14px;">
                   热门搜索词：<span style="cursor:pointer;font-size:15px;margin-left: 10px;" v-for="(item,index) in searchRecords" :key="index" @click="useHotword(item)">{{item.keyword}}</span>
-                  </div> -->
+                  </div>
                 </el-col>
-              </el-row>
+              </el-row> -->
               <div class="searchbar" v-if="searchTags.length > 0">
               <div style="line-height: 30px;">
                 <span class="item-title">搜索条件</span>
-                <el-tag closable>显示事业</el-tag>
-                <el-tag closable>经营</el-tag>
-                <el-tag closable>业绩提升</el-tag>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.words }}</el-tag>
+                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag }}</el-tag>
               </div>
             </div>
               <el-row class="search-item">
                 <el-col :span="24">
-                  <!-- <div class="item-title">组织领域</div> -->
                   <div style="margin-top:10px; display: flex;">
                      <div style="line-height: 25px;width:11.5%">
                       <span class="item-title" style="padding-right: 5px;">组织领域</span>
                       <span class="item-line"></span>
                     </div>
                     <div style="flex:1;">
-                    <el-radio-group v-model="category" size="mini" @change="search()">
-                    <el-radio-button label="0">全部</el-radio-button>
-                    <el-radio-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-radio-button>
-                    <!-- <el-radio-button label="1">显示事业</el-radio-button>
-                    <el-radio-button label="2">传感器事业</el-radio-button>
-                    <el-radio-button label="3">智慧医工事业</el-radio-button> -->
+                    <el-radio-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
+                    <el-radio-button :label="null">全部</el-radio-button>
+                    <el-radio-button v-for="item in domain" :key="item.code" :label="item.name"> {{ item.name}}</el-radio-button>
                   </el-radio-group>
                     </div>
-                    
+
                   </div>
-                 
+
                 </el-col>
               </el-row>
               <div class="search-div-collapse">
@@ -56,45 +49,17 @@
                     <span class="item-title" style="padding-right: 5px;">专业分类</span>
                     <span class="item-line"></span>
                      </div>
-                     <div style="flex:1;" id="searchBox" > 
-                        <el-radio-group v-model="type2" size="mini" @change="search()">
-                      <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button v-for="item in Profess" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
-                     
-                      <!-- <el-radio-button label="1">经营</el-radio-button>
-                      <el-radio-button label="2">领用</el-radio-button>
-                      <el-radio-button label="3">研发</el-radio-button>
-                      <el-radio-button label="4">营销</el-radio-button>
-                      <el-radio-button label="5">生产技术</el-radio-button>
-                      <el-radio-button label="6">信息技术</el-radio-button>
-                      <el-radio-button label="7">质量</el-radio-button> -->
+                     <div style="flex:1" id="searchBox">
+                        <el-radio-group v-model="queryCondition.majorType" size="mini" @change="search()">
+                      <el-radio-button :label="null">全部</el-radio-button>
+                      <el-radio-button v-for="item in Profess" :key="item.code" :label="item.name" > {{ item.name }} </el-radio-button>
                     </el-radio-group>
                      </div>
-                     
+
                     </div>
-                   
+
                   </el-col>
                 </el-row>
-                <!-- <el-row class="search-item">
-                  <el-col :span="24">
-                    <div class="item-title">应用场景</div>
-                    <div style="margin-top:10px; display: flex;">
-                        <div style="line-height: 25px;">
-                    <span class="item-title" style="padding-right: 5px;">专业领域</span>
-                    <span class="item-line"></span>
-                     </div>
-                     <div>
-                        <el-radio-group v-model="type3" size="mini" @click="search()">
-                      <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button label="1">业绩提升</el-radio-button>
-                      <el-radio-button label="2">人才培养</el-radio-button>
-                      <el-radio-button label="3">知识管理</el-radio-button>
-                    </el-radio-group>
-                     </div>
-                    </div>
-                    
-                  </el-col>
-                </el-row> -->
               </div>
               <div class="searBox" v-if="searchwd">
                  <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
@@ -102,15 +67,8 @@
                      <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
                 </el-button>
               </div>
-               
-              <!-- <el-row class="search-div-more">
-                <el-col :span="24">
-                  <el-button type="text" @click="queryExpand = true" v-if="!queryExpand">收起</el-button>
-                  <el-button type="text" v-else @click="queryExpand = false">更多</el-button>
-                </el-col>
-              </el-row> -->
             </el-row>
-            
+
             <el-row class="order-div">
               <span class="quyer-tag">
                 <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最热</el-button>
@@ -118,8 +76,6 @@
 
                 <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
               </span>
-              <!-- <span v-if="isFind" style="padding-left:10px;">本次搜索出 {{caseList.count}} 条结果</span> -->
-              <!-- <span class="more"></span> -->
             </el-row>
             <el-row class="data-content">
               <el-col :span="24" v-for="item in caseList.list" :key="item.id" class="case-list">
@@ -137,9 +93,7 @@
                     </div>
                     <router-link :to="'/case/detail?id='+item.id">
                     <div class="case-info-summary" >
-                      
                               {{item.summary}}
-
                     </div>
                      </router-link>
                     <div style="display: flex;justify-content: space-between;">
@@ -270,6 +224,7 @@ import author from '@/components/Portal/authorInfo.vue';
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js';
 import apiSearchterm from "@/api/modules/searchterm.js";
+import { deepClone } from "../../../utils";
 import apiDict from "@/api/modules/dict.js"
 export default {
   name: 'index',
@@ -313,8 +268,10 @@ export default {
         pageIndex:1,
         pageSize:10,
         orderField:'',
-        breCommend:null,
-        keyWord:''
+        // breCommend:null,
+        keyWord:'',
+        majorType:null,//专业分类
+        orgDomain:null,// 组织领域
       },
       keyWord:'',
       anking: 2,
@@ -326,7 +283,7 @@ export default {
       searchTags: []
     };
   },
-  
+
   mounted() {
     this.$nextTick(function() {
       this.closeSearch();
@@ -361,7 +318,7 @@ export default {
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
-   
+
    tagsClose(tag, index){
 
    },
@@ -489,6 +446,7 @@ export default {
       this.getCaseData();
     },
     async getCaseData(){
+      this.getTags();
       let isTopList = [];
       let caseList = [];
       await apiCase.queryList(this.queryCondition).then(res=>{
@@ -504,7 +462,7 @@ export default {
             })
             if(this.queryCondition.pageIndex == 1) {
               this.caseList.list =[];
-            } 
+            }
             this.caseList.list.push(...isTopList,...caseList);
             this.caseList.count=res.result.count;
             this.getCaseUserData(res.result.list)
@@ -515,6 +473,42 @@ export default {
       }).catch(err=>{
         console.log(err)
       })
+    },
+      getTags() {
+      this.searchTags = [];
+      let caseData = deepClone(this.queryCondition);
+      for (let i in caseData) {
+        if (
+          caseData[i] !== "" &&
+          i !== "pageIndex" &&
+          i !== "pageSize" &&
+          i !== "orderField" &&
+          caseData[i] !== null &&
+          caseData[i] !== undefined
+        ) {
+          if(caseData[i] !== '0') {
+             this.searchTags.push(
+             caseData[i]
+          );
+          }
+        }
+      }
+    },
+      tagsClose(tag, index) {
+      for (let i in this.queryCondition) {
+        if (tag === this.queryCondition[i]) {
+          if(i == 'majorType'){
+            this.queryCondition.majorType = null;
+          }
+          if(i == 'orgDomain'){
+            this.queryCondition.orgDomain = null;
+          }
+          this.queryCondition[i] = "";
+
+          this.searchTags.splice(index, 1);
+          this.getCaseData();
+        }
+      }
     },
     getCaseUserData(caseList){
       let ids=caseList.map((item,index)=>{
@@ -545,13 +539,13 @@ export default {
         }
       })
 
-   
+
     },
     getPopularity(){
       apiCase.queryPraises(5).then(res=>{
         if(res.status==200){
           this.Popularity=res.result
-       
+
         }
       })
     },
@@ -559,7 +553,7 @@ export default {
       apiCase.queryComments(5).then(res=>{
         if(res.status==200){
           this.Positive=res.result
-       
+
         }
       })
     },
@@ -645,7 +639,7 @@ export default {
 .item-line{
   padding-left: 2px;
   height: 20px;
-  
+
   background: #ddd;
 }
 
@@ -819,15 +813,15 @@ export default {
 
 
 .ranking-card {
-    
-   
+
+
     .center{
       text-align: center;
     }
   }
 .right-box {
   line-height: 25px;
-  
+
   .ranking-title {
   }
   .aligh-title{

From 656d0d063489e976882ab2c3b252f4cee7a2f82c Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 15:44:36 +0800
Subject: [PATCH 21/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 47b59e24..e6e55c0a 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -314,7 +314,7 @@ export default {
     //   immediate:true
     // }
   },
-    beforeDestroy(){
+  beforeDestroy(){
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {

From 77f7a0dbd33e1e8dfe89c2983cc15e6fb3feb7ab Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 16:01:58 +0800
Subject: [PATCH 22/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B@=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/comments.vue |  1 +
 src/views/article/contactMine.vue  |  9 +++++----
 src/views/portal/case/Detail.vue   | 13 ++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index 31092a0e..cdfcdc6c 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -320,6 +320,7 @@
         this.loadData();
       },
       inputValue(val,oldVal) {
+        console.log("333333");
        let fu = val.substr(-1);
        if(fu == '@'&&!oldVal) {
          this.toUserId = '';
diff --git a/src/views/article/contactMine.vue b/src/views/article/contactMine.vue
index 18874e52..991c7eae 100644
--- a/src/views/article/contactMine.vue
+++ b/src/views/article/contactMine.vue
@@ -11,7 +11,7 @@
       <!-- <el-option label="全部" :value="0"></el-option> -->
       <el-option label="文章" :value="2"></el-option>
       <!-- <el-option label="课程" :value="1"></el-option> -->
-      <!-- <el-option label="问答" :value="4"></el-option> -->
+      <el-option label="案例" :value="3"></el-option>
       <el-option label="问答" :value="4"></el-option>
       </el-select>
     <!-- <el-input style="width: 200px;margin-right: 10px" placeholder="请选择来源"></el-input> -->
@@ -154,6 +154,8 @@ export default {
 				
 				}else if(this.dataList.type == 4){
 				this.$router.push({ path: '/qa/answer', query: { id: item.objId } });
+				} else if(this.dataList.type == 3){
+				this.$router.push({ path: '/case/detail', query: { id: item.objId } });
 				}
     },
 
@@ -266,12 +268,11 @@ export default {
         toAname:this.replayContent.sysCreateBy,
         parentRead:true
       }
-     if(this.dataList.type == 2) {
-            apiComment.reply(replayInfo).then(res=>{
+     if(this.dataList.type == 2 || this.dataList.type == 3) {
+      apiComment.reply(replayInfo).then(res=>{
         if(res.status==200){
           this.$message.success("回复成功");
           this.shareShow = false;
-          //this.getData();
           if(!this.replyItem.replys){
             this.replyItem.replys=[];
           }
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index c96a70df..672059fd 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -35,7 +35,7 @@
             <pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview>
           </el-card>
           <!-- :authorId="articleDetailData.sysCreateAid" -->
-          <el-row><comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.sysCreateAid"></comments></el-row>
+          <el-row><comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.sysCreateAid" :toUsers="toUsers"></comments></el-row>
         </el-col>
       </el-row>
           </div>
@@ -143,7 +143,8 @@ export default {
   },
   data() {
     return {
-       ankingList:[],
+      toUsers:[],
+      ankingList:[],
       Popularity:[],
       Positive:[],
       resolveId: '',
@@ -215,16 +216,11 @@ export default {
         }
       })
     },
-
-
-   
     getCaseData() {
       apiCase.detail(this.resolveId,true).then(res => {
         if (res.status == 200) {
-         
           if (JSON.stringify(res.result) != '{}') {
             this.caseDetail = res.result;
-            console.log(this.caseDetail.filePath)
             this.getCaseUserDetail();
             if(this.caseDetail.filePath){
                this.pdfPath=this.basePath+this.caseDetail.filePath;
@@ -240,6 +236,9 @@ export default {
       apiUser.getByIds([this.caseDetail.sysCreateAid]).then(res => {
         if (res.status == 200 && res.result.length>0) {
           this.authorInfo = res.result[0];
+          this.toUsers = [
+            {name: res.result[0].name,  aid:res.result[0].aid ,sex:res.result[0].sex}
+          ];
           //console.log(res.result,'res.result');
         }
       });

From e84d83821e75acfb764d2420ed200ba0129214d4 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 16:14:36 +0800
Subject: [PATCH 23/33] =?UTF-8?q?=E6=B5=8F=E8=A7=88=20=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=20=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/interactBar.vue |  2 +-
 src/icons/svg/browse.svg              |  1 +
 src/views/portal/case/Detail.vue      |  2 +-
 src/views/portal/case/Index.vue       | 37 +++++++++++++++++----------
 4 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 src/icons/svg/browse.svg

diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index 64933aca..22d3608e 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -43,7 +43,7 @@
 
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top">
-          <svg-icon style="margin-right: 0;font-size: 16px;" icon-class="views"></svg-icon>
+          <svg-icon style="margin-right: 0;font-size: 16px;" icon-class="browse"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.views}}</span>
       </div>
diff --git a/src/icons/svg/browse.svg b/src/icons/svg/browse.svg
new file mode 100644
index 00000000..e941b0b0
--- /dev/null
+++ b/src/icons/svg/browse.svg
@@ -0,0 +1 @@
+<svg t="1654588163796" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2388" width="200" height="200"><path d="M512.00085 738.377c-121.05 0-219.428-98.377-219.428-219.428S390.95085 299.52 512.00185 299.52s219.428 98.377 219.428 219.429-98.377 219.428-219.428 219.428M0.00085 517.413c0 24.502 8.923 48.53 25.636 66.486 325.779 350.647 693.614 350.501 977.225-1.316 13.934-17.189 21.139-39.132 21.139-61.294v-3.072c0-23.15-7.936-45.934-23.004-63.561C690.03085 90.88 321.72085 93.513 22.05385 455.022A98.011 98.011 0 0 0 0.00185 517.376" p-id="2389" fill="#A3B1CC"></path><path d="M658.28685 518.949c0 80.932-65.353 146.285-146.285 146.285S365.71585 599.881 365.71585 518.95s65.353-146.286 146.286-146.286 146.285 65.353 146.285 146.286" p-id="2390" fill="#A3B1CC"></path></svg>
\ No newline at end of file
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 672059fd..89d1fa56 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -19,7 +19,7 @@
               <span>部门：{{ authorInfo.orgInfo }}</span>
               <!-- <span>案例编号：{{ caseDetail.id }}</span> -->
               <span v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
-              <interactBar :views="false" :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
+              <interactBar  :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
               
             </div>
             <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index e6e55c0a..8d267137 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -71,8 +71,8 @@
 
             <el-row class="order-div">
               <span class="quyer-tag">
-                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最热</el-button>
-                <el-button type="text" class="order-class" @click="searchData('praises')" :class="{ actice: queryCondition.orderField == 'praises' }">最新</el-button>
+                <el-button type="text" class="order-class" @click="searchData('comments')" :class="{ actice: queryCondition.orderField == 'comments' }">最热</el-button>
+                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
 
                 <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
               </span>
@@ -84,21 +84,31 @@
                     <div class="case-info-title">
                       <router-link :to="'/case/detail?id='+item.id">
                         <!-- <span v-if="i % 2 == 0" style="color:red;margin-right:5px">[组织推荐]</span> -->
-                        <span v-html="item.title"></span>
-                        <div class="case-info-date">
+             <div>
+                <span v-html="item.title"></span>
+                 <div class="case-info-date">
                          <i class="el-icon-time"></i>
                          <time-show :time="item.sysCreateTime"></time-show>
-                        </div>
-                      </router-link>
-                    </div>
+                 </div>
+                </div> 
+                 </router-link> 
+                  </div>
+         <div style="height:35px">
+           <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author> 
+           </div>
+
+                       
+                     
+                   
                     <router-link :to="'/case/detail?id='+item.id">
                     <div class="case-info-summary" >
                               {{item.summary}}
                     </div>
                      </router-link>
                     <div style="display: flex;justify-content: space-between;">
-                      <div><author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author> </div>
-                      <div><interactBar :type="0" :shares="false" :views="false" :data="item" :readonly="false"></interactBar> </div>
+                     
+                     <div>
+                        <interactBar :type="0" :shares="false"  :data="item" :readonly="false"></interactBar> </div>
                     </div>
                   </div>
                 </div>
@@ -234,9 +244,9 @@ export default {
      word: function() {
       if (this.showAll == false) {
         //对文字进行处理
-        return "展开搜索";
+        return "展开";
       } else {
-        return "收起搜索";
+        return "收起";
       }
     },
     isMore() {
@@ -267,7 +277,7 @@ export default {
       queryCondition:{
         pageIndex:1,
         pageSize:10,
-        orderField:'',
+        orderField:'comments',
         // breCommend:null,
         keyWord:'',
         majorType:null,//专业分类
@@ -749,7 +759,8 @@ export default {
           }
         }
         .case-info-summary {
-          height: 45px;
+          height: 60px;
+          
           line-height: 30px;
           font-size: 15px;
           color: #444444;

From cda5bf0be084d6628545ee9ef89c4a28033c4984 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 16:53:12 +0800
Subject: [PATCH 24/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/shares.js     |  2 +-
 src/views/case/ManageList.vue |  4 +--
 src/views/share/MyList.vue    | 48 +++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/api/modules/shares.js b/src/api/modules/shares.js
index 07b5dfb7..2dad7837 100644
--- a/src/api/modules/shares.js
+++ b/src/api/modules/shares.js
@@ -33,7 +33,7 @@ const remove=function(objId,objType){
 //    toAname   分享给人的名称
 //
 const querylist=function(query){
-	return ajax.post('/xboe/m/share/list',data);
+	return ajax.post('/xboe/m/share/list',query);
 }
 // 当前用户是否已分享
 // // objType，点赞对象类型，， 1课程 2文章,3案例, 4问答
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index e41ea03c..ba2d53ad 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -158,8 +158,8 @@ export default {
   },
   methods: {
     reset() {
-      this.queryObj.isTop = ''
-      this.queryObj.keyWord = ''
+      this.queryObj.isTop = '';
+      this.queryObj.keyWord = '';
       this.getData()
     },
     //获取案例列表数据
diff --git a/src/views/share/MyList.vue b/src/views/share/MyList.vue
index 7834cc98..90510e02 100644
--- a/src/views/share/MyList.vue
+++ b/src/views/share/MyList.vue
@@ -48,6 +48,30 @@
        
           </div>
         </el-tab-pane>
+        <el-tab-pane label="案例" name="case">
+           <div>
+              <!-- <qa-items @confirm="confirm" :items="qaList.list"></qa-items> -->
+              <!-- v-if="qaList.count>qaList.pageSize" -->
+              <!-- <div v-if="qaList.list.length > 0" style="text-align: center;margin-top:57px;">
+                <el-pagination
+                  background
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="qaList.pageIndex"
+                  :page-sizes="[10, 20, 30, 40]"
+                  :page-size="qaList.pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="qaList.count"
+                ></el-pagination>
+              </div> -->
+              <!-- <div v-else>
+                <div v-if="qaList.list.length == 0">
+                  <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+                  <div v-else class="zan-wu">暂无数据</div>
+                </div>
+              </div> -->
+           </div>
+        </el-tab-pane>
         <el-tab-pane label="文章" name="article">
            <div style="min-height: 500px;">
               <article-items @confirm="confirm" :items="articleList.list"></article-items>
@@ -153,12 +177,16 @@
         if (this.tabName == 'qa') {
           this.findQa();
         }
+        if (this.tabName == 'case') {
+          this.findCase();
+        }
         if (this.tabName == 'article') {
           this.findArticle();
         }
         if (this.tabName == 'course') {
           this.findCourse();
         }
+      
       },
        resData() {
         this.keyword = '';
@@ -190,6 +218,10 @@
         if (tab.name == 'course') {
           this.findCourse();
         }
+        console.log(tab.name,'tab.name');
+        if (tab.name == 'case') {
+          this.findCase();
+        }
       },
       //分页点击事件
       handleSizeChange(value) {
@@ -205,6 +237,10 @@
           this.courseList.pageSize = value;
           this.findCourse();
         }
+        if (this.tabName == 'case') {
+          this.caseList.pageSize = value;
+          this.findCase();
+        }
       },
       //分页点击事件
       handleCurrentChange(value) {
@@ -220,6 +256,18 @@
           this.courseList.pageIndex = value;
           this.findCourse();
         }
+        if (this.tabName == 'case') {
+          this.caseList.pageIndex = value;
+          this.findCase();
+        }
+      },
+      // 案例数据查询
+      findCase() {
+        let { pageIndex, pageSize } = this.caseList;
+        let query = { pageIndex, pageSize,keyword:this.keyword,isRead: this.isRead,objType:3};
+        apiShares.myCaseList(query).then(res=>{
+          console.log(res,'res');
+        })
       },
       //问答数据查询
       findQa() {

From fecb88bf43fe68ed54977691799ccd23ab2effae Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 16:55:13 +0800
Subject: [PATCH 25/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 8d267137..cc3224e4 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -85,7 +85,7 @@
                       <router-link :to="'/case/detail?id='+item.id">
                         <!-- <span v-if="i % 2 == 0" style="color:red;margin-right:5px">[组织推荐]</span> -->
              <div>
-                <span v-html="item.title"></span>
+                <span class="" v-html="item.title"></span>
                  <div class="case-info-date">
                          <i class="el-icon-time"></i>
                          <time-show :time="item.sysCreateTime"></time-show>
@@ -95,16 +95,18 @@
                   </div>
          <div style="height:35px">
            <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author> 
-           </div>
-
-                       
-                     
-                   
+           </div> 
                     <router-link :to="'/case/detail?id='+item.id">
                     <div class="case-info-summary" >
-                              {{item.summary}}
+                         {{item.summary}}
                     </div>
                      </router-link>
+                     <div class="button-wrap" v-if="needShowExpande">
+                        <div class="exp-but" @click="expandeClick" v-if="!expande">展开
+                        </div>
+                        <div class="exp-but" @click="expandeClick" v-else>收起</div>
+                    </div>
+                    
                     <div style="display: flex;justify-content: space-between;">
                      
                      <div>

From 40191decdb558d91c81fe9d3e3606df93d9261ad Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 16:59:46 +0800
Subject: [PATCH 26/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 89d1fa56..74895453 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -26,6 +26,9 @@
             <div class="btn-div" >
               <span v-if="caseDetail.orgDomain" class="item">{{ caseDetail.orgDomain }}</span>
               <span v-if="caseDetail.majorType" class="item">{{ caseDetail.majorType }}</span>
+              <span v-if="caseDetail.caseType" class="item">{{ caseDetail.caseType }}</span>
+               <span v-if="caseDetail.caseType1" class="item">{{ caseDetail.caseType1 }}</span>
+                <span v-if="caseDetail.caseType2" class="item">{{ caseDetail.caseType2 }}</span>
             </div>
           </el-card>
           <el-card :body-style="{ padding: '0px' }" class="jianjie">
@@ -338,7 +341,7 @@ export default {
     padding-bottom: 10px;
     color: #666;
     .item {
-      margin: 0 8px 0 15px;
+      margin: 0 10px 0 0px;
       border: 1px solid #9e9e9e;
       padding: 3px 10px;
       border-radius: 8px;

From 0cf9d297e8894aff3e7799e2aee34bb7db890244 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 17:19:42 +0800
Subject: [PATCH 27/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index cc3224e4..b413dac1 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -284,6 +284,7 @@ export default {
         keyWord:'',
         majorType:null,//专业分类
         orgDomain:null,// 组织领域
+        orderAsc: false
       },
       keyWord:'',
       anking: 2,
@@ -400,6 +401,7 @@ export default {
       this.search()
     },
     searchData(num) {
+
       this.queryCondition.orderField = num;
       this.getCaseData();
     },
@@ -495,6 +497,7 @@ export default {
           i !== "pageIndex" &&
           i !== "pageSize" &&
           i !== "orderField" &&
+          i !== "orderAsc" &&
           caseData[i] !== null &&
           caseData[i] !== undefined
         ) {

From 1b3ca4ce1e2fec37e75a1b72fb632a03893cceb4 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 17:34:30 +0800
Subject: [PATCH 28/33] =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 51 ++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index b413dac1..189cc36d 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -90,25 +90,32 @@
                          <i class="el-icon-time"></i>
                          <time-show :time="item.sysCreateTime"></time-show>
                  </div>
-                </div> 
-                 </router-link> 
+                </div>
+                 </router-link>
                   </div>
          <div style="height:35px">
-           <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author> 
-           </div> 
-                    <router-link :to="'/case/detail?id='+item.id">
-                    <div class="case-info-summary" >
-                         {{item.summary}}
+           <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author>
+           </div>
+                    <!-- <router-link :to="'/case/detail?id='+item.id"> -->
+                    <!-- class="case-info-summary"  -->
+                    <div>
+                      <router-link :to="'/case/detail?id='+item.id">
+                         <!-- {{item.summary}} -->
+                          {{displayAll(item)}}
+                          </router-link>
+                          <span style="color:#588afc" v-if="item.summary.length>90" @click="changeIsAll(item)">
+                              {{item.isAll?'收起':'全文'}}
+                          </span>
                     </div>
-                     </router-link>
-                     <div class="button-wrap" v-if="needShowExpande">
+                     <!-- </router-link> -->
+                     <!-- <div class="button-wrap" v-if="needShowExpande">
                         <div class="exp-but" @click="expandeClick" v-if="!expande">展开
                         </div>
                         <div class="exp-but" @click="expandeClick" v-else>收起</div>
-                    </div>
-                    
+                    </div> -->
+
                     <div style="display: flex;justify-content: space-between;">
-                     
+
                      <div>
                         <interactBar :type="0" :shares="false"  :data="item" :readonly="false"></interactBar> </div>
                     </div>
@@ -331,17 +338,20 @@ export default {
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
-
-   tagsClose(tag, index){
-
-   },
-
-
+   //展示全部
+      displayAll(item) {
+        if(!item.isAll && item.summary && item.summary.length > 90) {
+            return item.summary.slice(0, 90) + "...";
+        }
+        return item.summary;
+      },
+      changeIsAll(item) {
+        item.isAll=!item.isAll;
+      },
     closeSearch() {
       this.showAll = !this.showAll;
       var searchBoxHeght = document.getElementById("searchBox");
       var searchBoxWidth = document.getElementById("searchBox");
-      // console.log(searchBoxWidth.clientWidth);
       if(searchBoxWidth.clientWidth > 950){
        this.searchwd = false;
       }
@@ -467,6 +477,7 @@ export default {
         if(res.status==200){
           if(res.result.list.length>0){
             res.result.list.forEach(item=>{
+              item.isAll=false;
               item.authorInfo={aid:'',name:'',orgInfo:'',avatar:'',sex:null};
               if(item.isTop) {
                 isTopList.push(item);
@@ -765,7 +776,7 @@ export default {
         }
         .case-info-summary {
           height: 60px;
-          
+
           line-height: 30px;
           font-size: 15px;
           color: #444444;

From 2b26166ef24cd94bd4bb3c6d6f3bb713dd314e7b Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 18:07:44 +0800
Subject: [PATCH 29/33] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Case/caseItems.vue | 157 ++++++++++++++++++++++++++++++
 src/views/share/MyList.vue        |  35 ++++---
 2 files changed, 179 insertions(+), 13 deletions(-)
 create mode 100644 src/components/Case/caseItems.vue

diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue
new file mode 100644
index 00000000..0982522c
--- /dev/null
+++ b/src/components/Case/caseItems.vue
@@ -0,0 +1,157 @@
+<template>
+  <div style="">
+    <div class="article-list" v-for="(item, idx) in items" :key="idx">
+      <div class="article-info" @click="jumpRouter(item)">
+        <div class="article-info-title">
+          <span v-if="item.isRead" class="readed">【已查看】</span>
+          <span class="noRead" v-else>【未查看】</span>
+          <span class="title one-line-ellipsis" v-html="$keywordActiveShow(item.cases.title,keyword)"></span>
+    
+        </div>
+        <div v-html="$keywordActiveShow(item.cases.summary,keyword)" class="article-info-summary two-line-ellipsis">
+        </div>
+        <!-- v-html="$keywordActiveShow(item.summary,keyword)" -->
+        <div style="display:flex;justify-content: space-between;">
+          <div class="article-info-tools">
+          <!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo> -->
+          <span style="color: #999999;">{{ item.time }}</span>
+          <span v-if="type=='myShare'" style="color: #999999;font-size: 14px;">分享给{{item.toAname}}</span>
+          <span v-else>{{item.sysCreateBy}}分享给我</span>
+          <!-- <interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar> -->
+        </div>
+        <div>
+          <el-button style="color: #8590A6;" v-if="!item.isRead&&type=='myShare'" type="text" icon="el-icon-refresh-right" @click.stop="deleteshares(item)">撤回</el-button>
+        </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import apiShares from '@/api/modules/shares.js';
+export default {
+    name:'caseItems',
+    props:{
+      items: {
+      //name,
+      type: Array,
+      default: () => []
+    },
+    type:{
+      type:String,
+      default:()=>{
+        return 'myShare'
+      }
+    },
+     keyword:{
+      type:String,
+      default:()=>{
+        return ''
+      }
+    }
+    },
+     mounted:{
+      deleteshares(item){
+      this.$emit('confirm',item)
+    },
+    },
+    created() {
+      console.log(this.items)
+    },
+   
+}
+</script>
+<style lang="scss" scoped>
+.article-status1 {
+  padding: 3px;
+  border: 1px dotted #1ea0fa;
+  color: #1ea0fa;
+}
+.article-status2 {
+  padding: 3px;
+  border: 1px dotted #00aa00;
+  color: #00aa00;
+}
+.article-status3 {
+  padding: 3px;
+  border: 1px dotted #ff0000;
+  color: #ff0000;
+}
+.article-list {
+  border-bottom: 1px solid #dddddd;
+  // padding: 10px;
+  padding-bottom: 20px;
+  margin-top: 20px;
+  border-bottom: 1px solid #e9e9e9;
+  cursor: pointer;
+}
+
+.article-info {
+  cursor: pointer;
+  .article-info-title {
+    font-size: 16px;
+    font-weight: 400;
+    display: flex;
+    justify-content: flex-start;
+    
+    align-items: center;
+    .readed{
+      font-size: 18px;
+      color: #3e7fff;
+      // margin-bottom: 6px;
+    }
+    .noRead{
+      font-size: 18px;
+      color:#FF3E3E;
+      // margin-bottom: 6px;
+    }
+    .title{
+      line-height: 25px;
+      margin-left: 10px;
+      font-size: 18px;
+      flex-shrink: 10000;
+      font-weight: 500;
+      color: #333333;
+    }
+    .el-button{
+      margin-left: auto;
+    }
+    // .article-info-date {
+    //   height: 40px;
+    //   line-height: 40px;
+    //   float: right;
+    //   font-weight: 200;
+    //   color: #999999;
+    //   i {
+    //     margin-right: 5px;
+    //   }
+    // }
+  }
+  .article-info-summary {
+    height: 46px;
+    font-weight: 200;
+    font-size: 16px;
+    line-height: 1.5;
+    margin:7px 0;
+  }
+  .article-info-tools {
+    color: #999999;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    >span{
+      font-size: 14px;
+       color: #747474;
+
+      // margin-top: -2px;
+    }
+    // >span:first-of-type{
+    //   margin-left: 10px;
+    // }
+    // >span:last-of-type{
+    //   margin-top: -4px;
+    //   margin-right:auto;
+    // }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/share/MyList.vue b/src/views/share/MyList.vue
index 90510e02..93b471e8 100644
--- a/src/views/share/MyList.vue
+++ b/src/views/share/MyList.vue
@@ -49,27 +49,26 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="案例" name="case">
-           <div>
-              <!-- <qa-items @confirm="confirm" :items="qaList.list"></qa-items> -->
-              <!-- v-if="qaList.count>qaList.pageSize" -->
-              <!-- <div v-if="qaList.list.length > 0" style="text-align: center;margin-top:57px;">
+           <div style="min-height: 500px;">
+            <case-items  @confirm="confirm" :items="caseList.list"></case-items>
+            <div v-if="caseList.list.length > 0" style="text-align: center;margin-top:57px;">
                 <el-pagination
                   background
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
-                  :current-page="qaList.pageIndex"
+                  :current-page="caseList.pageIndex"
                   :page-sizes="[10, 20, 30, 40]"
-                  :page-size="qaList.pageSize"
+                  :page-size="articleList.pageSize"
                   layout="total, sizes, prev, pager, next, jumper"
-                  :total="qaList.count"
+                  :total="caseList.count"
                 ></el-pagination>
-              </div> -->
-              <!-- <div v-else>
-                <div v-if="qaList.list.length == 0">
+              </div>
+              <div v-else>
+                <div v-if="caseList.list.length == 0">
                   <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
                   <div v-else class="zan-wu">暂无数据</div>
                 </div>
-              </div> -->
+              </div>
            </div>
         </el-tab-pane>
         <el-tab-pane label="文章" name="article">
@@ -133,9 +132,10 @@
   import qaItems from '@/components/Qa/shareList.vue'
   import apiShares from '@/api/modules/shares.js';
   import apiUser from '@/api/system/user.js';
+  import caseItems from '@/components/Case/caseItems.vue'
   export default {
     name: 'myShareIndex',
-    components:{articleItems,courseItems,qaItems},
+    components:{articleItems,courseItems,qaItems,caseItems},
     data(){
         return {
           isRead: '',
@@ -266,7 +266,13 @@
         let { pageIndex, pageSize } = this.caseList;
         let query = { pageIndex, pageSize,keyword:this.keyword,isRead: this.isRead,objType:3};
         apiShares.myCaseList(query).then(res=>{
-          console.log(res,'res');
+          console.log(res,'res');   
+          if(res.status == 200) {
+             this.caseList.count = res.result.count;
+             this.caseList.list = res.result.list;
+          }else {
+            this.$message.error(res.message);
+          }
         })
       },
       //问答数据查询
@@ -366,6 +372,9 @@
             if (this.tabName == 'course') {
               this.findCourse();
             }
+            if (this.tabName == 'case') {
+              this.findCase();
+            }
           }else{
             this.$message.error('撤回失败');
           }

From 5efe874e99b604647bbb8ade2160d395100a263a Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 18:34:09 +0800
Subject: [PATCH 30/33] =?UTF-8?q?=E6=92=A4=E5=9B=9E=20=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Case/caseItems.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue
index 0982522c..8290103a 100644
--- a/src/components/Case/caseItems.vue
+++ b/src/components/Case/caseItems.vue
@@ -50,7 +50,18 @@ export default {
       }
     }
     },
-     mounted:{
+     methods:{
+       jumpRouter(item){
+      if(this.type!='myShare'){
+        apiShares.updateIsRead(item.id).then(res=>{
+          if(res.status==200){
+            this.$emit('confirm',item)
+          }
+        })
+      }
+      this.$router.push({path:'/case/detail',query:{id:item.cases.id}})
+     // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`)
+    },
       deleteshares(item){
       this.$emit('confirm',item)
     },

From 4ea2cc39fab35eae917962edf983c0e9c7ac03ec Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 18:53:29 +0800
Subject: [PATCH 31/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 48 ++++++++++++++++++++++--------
 src/views/share/ToList.vue      | 52 ++++++++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 189cc36d..e960fb8b 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -25,7 +25,7 @@
               <el-row class="search-item">
                 <el-col :span="24">
                   <div style="margin-top:10px; display: flex;">
-                     <div style="line-height: 25px;width:11.5%">
+                     <div style="line-height: 25px;padding-right: 5px;">
                       <span class="item-title" style="padding-right: 5px;">组织领域</span>
                       <span class="item-line"></span>
                     </div>
@@ -45,7 +45,7 @@
                   <el-col :span="24">
                     <!-- <div class="item-title">专业领域</div> -->
                     <div style="margin-top:10px; display: flex;">
-                      <div style="line-height: 25px;width:11.5%">
+                      <div style="line-height: 25px;padding-right: 5px;">
                     <span class="item-title" style="padding-right: 5px;">专业分类</span>
                     <span class="item-line"></span>
                      </div>
@@ -123,12 +123,17 @@
                 </div>
               </el-col>
             </el-row>
+            <div class="pagination-div">
+              <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
+              <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
+              <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+              <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
+            </div>
+            <div v-if="isSeach" style="height:382px">
 
+            </div>
           </el-card>
-          <div class="pagination-div">
-            <span class="pag-text" v-if="isMore" @click="loadMore()">加载更多</span>
-            <span class="pag-text" v-else>没有更多数据了</span>
-          </div>
+     
         </el-col>
          </el-row>
       </div>
@@ -268,6 +273,8 @@ export default {
   },
   data() {
     return {
+      moreState:1,// 1 加载更多 2 加载中 3无数据
+      isSeach:false,
       searchwd:true,
       showAll:true,//是否展开全部
       searchRecords:[],
@@ -312,13 +319,17 @@ export default {
       this.protocolDialogVisible = true;
     }
     this.keyWord = this.$route.query.keyword;
+    if(this.keyWord != '') {
+     this.isSeach = true;
+    }
     this.getAnkingData();
     this.getPopularity();
     this.searchterm();
     this.getPositive();
     this.getProfess();
     this.getdomain();
-    this.getCaseData();
+    // this.getCaseData();
+    this.search();
     window.addEventListener(
       "scroll",
       this.handleScroll
@@ -393,7 +404,6 @@ export default {
      let key ='org_domain'
       apiDict.items(key).then(res =>{
         if(res.status==200){
-         //  console.log(res)
            this.domain = res.result
         }
       })
@@ -408,10 +418,11 @@ export default {
     },
     emitInput(val) {
       this.keyWord=val;
+      this.isSeach =true;
+      this.queryCondition.pageIndex = 1
       this.search()
     },
     searchData(num) {
-
       this.queryCondition.orderField = num;
       this.getCaseData();
     },
@@ -473,9 +484,14 @@ export default {
       this.getTags();
       let isTopList = [];
       let caseList = [];
+      if(this.queryCondition.pageIndex == 1) {
+        this.caseList.list =[];
+      }
+      this.moreState = 2;
       await apiCase.queryList(this.queryCondition).then(res=>{
         if(res.status==200){
           if(res.result.list.length>0){
+            this.isSeach =false;
             res.result.list.forEach(item=>{
               item.isAll=false;
               item.authorInfo={aid:'',name:'',orgInfo:'',avatar:'',sex:null};
@@ -485,12 +501,17 @@ export default {
                 caseList.push(item)
               }
             })
-            if(this.queryCondition.pageIndex == 1) {
-              this.caseList.list =[];
-            }
+            
             this.caseList.list.push(...isTopList,...caseList);
             this.caseList.count=res.result.count;
             this.getCaseUserData(res.result.list)
+            this.moreState = 1;
+            if(res.result.count === res.result.list.length) {
+            this.moreState = 3;
+            }
+          } else {
+                this.moreState = 3;
+
           }
         }else{
           this.$message.error(res.message);
@@ -732,6 +753,9 @@ export default {
   .pagination-div {
     text-align: center;
     padding: 10px 0;
+    .pag-text{
+
+    }
   }
   .order-div {
     padding: 12px 15px;
diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue
index 6878033f..8906d798 100644
--- a/src/views/share/ToList.vue
+++ b/src/views/share/ToList.vue
@@ -64,6 +64,30 @@
               </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="案例" name="case">
+          <div style="min-height: 500px;">
+            <article-items :keyword="keyword" type="toMy" @confirm="confirm" :items="caseList.list"></article-items>
+            <!-- v-if="articleList.count>articleList.pageSize" -->
+            <div v-if="caseList.list.length > 0" style="text-align: center; margin-top:57px">
+              <el-pagination
+                background
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="caseList.pageIndex"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="caseList.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="caseList.count"
+              ></el-pagination>
+            </div>
+             <div v-else>
+                <div v-if="caseList.list.length == 0">
+                  <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+                  <div v-else class="zan-wu">暂无数据</div>
+                </div>
+              </div>
+          </div>
+        </el-tab-pane>
         <el-tab-pane label="文章" name="article">
           <div style="min-height: 500px;">
             <article-items :keyword="keyword" type="toMy" @confirm="confirm" :items="articleList.list"></article-items>
@@ -180,6 +204,9 @@ export default {
       if (this.tabName == 'course') {
         this.findCourse();
       }
+      if (this.tabName == 'case') {
+        this.findCase();
+      }
      
     },
     resData() {
@@ -212,6 +239,9 @@ export default {
       if (tab.name == 'course') {
         this.findCourse();
       }
+      if (tab.name == 'case') {
+        this.findCase();
+      }
     },
     //分页点击事件
     handleSizeChange(value) {
@@ -227,7 +257,10 @@ export default {
         this.courseList.pageSize = value;
         this.findCourse();
       }
-       
+      if (this.tabName == 'case') {
+        this.caseList.pageSize = value;
+        this.findCase()
+      } 
     },
     //分页点击事件
     handleCurrentChange(value) {
@@ -243,8 +276,25 @@ export default {
         this.courseList.pageIndex = value;
         this.findCourse();
       }
+      if (this.tabName == 'case') {
+        this.caseList.pageIndex = value;
+        this.findCase();
+      }
      
     },
+    // 案例
+    findCase(){
+      let { pageIndex, pageSize } = this.caseList;
+      let query = { pageIndex, pageSize, keyword: this.keyword, isRead: this.isRead };
+      apiShares.myCaseList(query).then(res=>{
+        if(res.status == 200) {
+          this.caseList.count = res.result.count;
+          this.caseList.list = res.result.list;
+        } else {
+           this.$message.error(res.message);
+        }
+      })
+    },
     //问答数据查询
     findQa() {
       let { pageIndex, pageSize } = this.qaList;

From c44bf9c2cdce87a72451f316cdf6c564a827de23 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 18:57:10 +0800
Subject: [PATCH 32/33] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/share/ToList.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue
index 8906d798..535cfb52 100644
--- a/src/views/share/ToList.vue
+++ b/src/views/share/ToList.vue
@@ -66,7 +66,7 @@
         </el-tab-pane>
         <el-tab-pane label="案例" name="case">
           <div style="min-height: 500px;">
-            <article-items :keyword="keyword" type="toMy" @confirm="confirm" :items="caseList.list"></article-items>
+            <case-items :keyword="keyword" type="toMy" @confirm="confirm" :items="caseList.list"></case-items>
             <!-- v-if="articleList.count>articleList.pageSize" -->
             <div v-if="caseList.list.length > 0" style="text-align: center; margin-top:57px">
               <el-pagination
@@ -142,6 +142,7 @@
 </template>
 
 <script>
+import caseItems from '@/components/Case/caseItems.vue'
 import articleItems from '@/components/Article/shareItems.vue';
 import courseItems from '@/components/Course/shareItem.vue';
 import qaItems from '@/components/Qa/shareList.vue';
@@ -149,7 +150,7 @@ import apiShares from '@/api/modules/shares.js';
 import apiUser from '@/api/system/user.js';
 export default {
   name: 'myShareIndex',
-  components: { articleItems, courseItems, qaItems },
+  components: { articleItems, courseItems, qaItems,caseItems },
   data() {
     return {
       isSearh:false,

From 8a416cc8a7058b1dbd6ad1d3e5f499bd6cc462d7 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Tue, 7 Jun 2022 19:13:33 +0800
Subject: [PATCH 33/33] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Case/caseItems.vue   |  1 -
 src/components/Case/collectList.vue | 38 +++++++++++++++++++++++------
 src/views/user/MyFavorites.vue      | 36 +++++++++++++++------------
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue
index 8290103a..3044d9ab 100644
--- a/src/components/Case/caseItems.vue
+++ b/src/components/Case/caseItems.vue
@@ -104,7 +104,6 @@ export default {
     font-weight: 400;
     display: flex;
     justify-content: flex-start;
-    
     align-items: center;
     .readed{
       font-size: 18px;
diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue
index 085e9b3e..efecb94e 100644
--- a/src/components/Case/collectList.vue
+++ b/src/components/Case/collectList.vue
@@ -1,21 +1,21 @@
 <template>
   <div style="">
     <div class="article-list" v-for="(item,idx) in items" :key="idx">
-      <div class="article-info">
-        <div class="article-info-title">
-          <router-link :to="'/case/detail?id='+item.cases.id" target="_blank" style="padding-left: 5px;">{{item.cases.title}}</router-link>
+      <div class="article-info ">
+        <div class="article-info-title title-line-ellipsis" >
+          <router-link :to="'/case/detail?id='+item.cases.id" target="_blank" >{{item.cases.title}}</router-link>
           <div class="article-info-date">
             <el-button @click="delItem(item)" type="text" icon="el-icon-remove">取消收藏</el-button>
           </div>
         </div>
-        <div class="article-info-summary">
+        <div class="article-info-summary three-line-ellipsis">
           {{item.cases.summary}}
         </div>
         <div class="article-info-tools">
           <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo>
           <span>发布时间：{{ item.cases.sysCreateTime | timeFilter }}</span>
           <span>收藏时间：{{ item.time | timeFilter }}</span>
-          <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar>
+          <!-- <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar> -->
         </div>
       </div>
     </div>
@@ -58,6 +58,26 @@
 </script>
 
 <style lang="scss" scoped>
+.title-line-ellipsis{
+   width: 100%;
+   display: -webkit-box;
+   overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  box-sizing: border-box;
+  word-break:break-all;
+}
+.three-line-ellipsis{
+   width: 100%;
+   display: -webkit-box;
+   overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  box-sizing: border-box;
+  word-break:break-all;
+}
   .article-status1{
     padding: 3px;
     border: 1px dotted #1EA0FA;
@@ -75,8 +95,8 @@
   }
   .article-list {
     margin: 5px 0;
-    border: 1px solid #dddddd;
-    padding: 10px;
+    border-bottom: 1px solid #dddddd;
+    padding: 0px;
   }
 
   .article-info {
@@ -97,10 +117,12 @@
       }
     }
     .article-info-summary {
-      height: 65px;
+     
+     line-height: 25px;
       color: #999999;
     }
     .article-info-tools {
+      height: 45px;
       color: #999999;
       display: flex;
       justify-content: flex-start;
diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue
index 9df95d9d..13ed45cb 100644
--- a/src/views/user/MyFavorites.vue
+++ b/src/views/user/MyFavorites.vue
@@ -79,7 +79,7 @@
             <course-items :items="courseList.list" @confirm="confirm"></course-items>
           </div>
           <!-- v-if="courseList.count>courseList.pageSize" -->
-          <div v-if="caseList.list.length > 0" style="text-align: center;margin-top:57px">
+          <div v-if="courseList.list.length > 0" style="text-align: center;margin-top:57px">
             <el-pagination
               background
               @size-change="handleSizeChange"
@@ -92,24 +92,20 @@
             ></el-pagination>
           </div>
           <div v-else>
-            <div v-if="caseList.list.length == 0">
+            <div v-if="courseList.list.length == 0">
               <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
               <div v-else class="zan-wu">暂无数据</div>
             </div>
           </div>
         </el-tab-pane>
-        <!-- <el-tab-pane label="案例" name="case">
+        <el-tab-pane label="案例" name="case">
           <div>
-            <div style="padding-bottom: 10px;">
-              <div style="display: flex;justify-content:flex-start;">
-                <div style="padding: 0px 5px;"><el-input placeholder="关键词查询" v-model="caseList.title"></el-input></div>
-                <div style="padding: 0px 5px;"><el-button @click="findCase" icon="el-icon-search" type="primary" size="small">查询</el-button></div>
-              </div>
-            </div>
             <case-items @confirm="confirm" :items="caseList.list"></case-items>
           </div>
-          <div style="text-align: center;" v-if="caseList.count>caseList.pageSize">
+          <div style="text-align: center;margin-top:50px;" v-if="caseList.list.length > 0
+           ">
             <el-pagination
+            background
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="caseList.pageIndex"
@@ -118,8 +114,15 @@
               layout="total, sizes, prev, pager, next, jumper"
               :total="caseList.count"
             ></el-pagination>
+
           </div>
-        </el-tab-pane> -->
+           <div v-else>
+            <div v-if="caseList.list.length == 0">
+              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+              <div v-else class="zan-wu">暂无数据</div>
+            </div>
+          </div>
+        </el-tab-pane>
         <el-tab-pane label="文章" name="article">
           <div>
             <!-- <div style="padding-bottom: 10px;">
@@ -195,7 +198,7 @@
 <script>
 import articleItems from '@/components/Article/collectList.vue';
 import courseItems from '@/components/Course/collectItem.vue';
-// import caseItems from '@/components/Case/collectList.vue';
+import caseItems from '@/components/Case/collectList.vue';
 import qaItems from '@/components/Qa/favoritesQaList.vue';
 import apiFavorite from '@/api/modules/favorites.js';
 import apiUser from '@/api/system/user.js';
@@ -203,7 +206,7 @@ import apiCourse from "@/api/modules/coursePortal.js";
 import courseImage from '@/components/Course/courseImage.vue';
 export default {
   name: 'myShareIndex',
-  components: { articleItems, courseItems, qaItems, courseImage },
+  components: { articleItems, courseItems, qaItems, courseImage,caseItems },
   data() {
     return {
       isSearh:false,
@@ -383,6 +386,7 @@ export default {
               item.avatar=''
               item.name=''
               item.orgInfo=''
+              item.sex= null
               courseIds.push(item.objId);
             })
             this.loadCouserTeacher(res.result.list,courseIds);
@@ -482,14 +486,16 @@ export default {
     findCase() {
       let { pageIndex, pageSize } = this.caseList;
       let query = { pageIndex, pageSize };
-      if (this.caseList.title) {
+      // if (this.caseList.cases.title) {
         query.keyword = this.keyword.trim();
-      }
+      // }
       query.resolve = this.isRead;
       apiFavorite.casePageList(query).then(res => {
         if (res.status == 200) {
+        
           this.caseList.count = res.result.count;
           this.caseList.list = res.result.list;
+  console.log(this.caseList)
           if (this.caseList.list.length != 0) {
             this.getCaseUserData(res.result.list);
           }