From 8e6c00d266e37e31d0129c95126dc0accef9e301 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 9 Sep 2024 09:40:35 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/cases.js         | 12 +++++
 src/views/portal/case/Charts.vue | 41 ++++++++------
 src/views/portal/case/Index.vue  | 92 ++++++++++++++++++++------------
 3 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index 88c02e73..ba64b45f 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -88,6 +88,12 @@ const usernameList = function (pageSize) {
 const queryPraises = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
 }
+const queryPraisesNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryPopularity?pageSize=${pageSize}&rankType=${rankType}`);
+}
+const queryRecommendRank = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${pageSize}`);
+}
 /*
 好评榜
 @param pageSize 长度
@@ -95,6 +101,9 @@ const queryPraises = function (pageSize) {
 const queryComments = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
 }
+const queryCommentsNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryHighOpinion?pageSize=${pageSize}&rankType=${rankType}`);
+}
 
 /**
  * 专业分类
@@ -202,7 +211,10 @@ export default {
   query,
   usernameList,
   queryPraises,
+  queryPraisesNew,
+  queryRecommendRank,
   queryComments,
+  queryCommentsNew,
   majorTypes,
   details,
   ids,
diff --git a/src/views/portal/case/Charts.vue b/src/views/portal/case/Charts.vue
index a2c6162c..49c59005 100644
--- a/src/views/portal/case/Charts.vue
+++ b/src/views/portal/case/Charts.vue
@@ -23,11 +23,11 @@
             </div>
             <ul class="charts_list">
               <li v-for="(item, index) in Positive" :key="index" class="list">
-                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.id">
+                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
                   <img class="num" :src="require(
                     `../../../../public/images/${imgNumBlue(index)}.png`
                   )" alt="">
-                  <span class="text">{{ item.title }}</span>
+                  <span class="text">{{ item.caseTitle }}</span>
                 </router-link>
               </li>
             </ul>
@@ -47,11 +47,11 @@
             </div>
             <ul class="charts_list">
               <li v-for="(item, index) in Popularity" :key="index" class="list">
-                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.id">
+                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
                   <img class="num" :src="require(
                     `../../../../public/images/${imgNumOrg(index)}.png`
                   )" alt="">
-                  <span class="text">{{ item.title }}</span>
+                  <span class="text">{{ item.caseTitle }}</span>
                 </router-link>
               </li>
             </ul>
@@ -61,12 +61,12 @@
               <div class="text">推荐榜</div>
             </div>
             <ul class="charts_list">
-              <li v-for="(item, index) in Positive" :key="index" class="list">
-                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.id">
+              <li v-for="(item, index) in recommendRank" :key="index" class="list">
+                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
                   <img class="num" :src="require(
                     `../../../../public/images/${imgNumPink(index)}.png`
                   )" alt="">
-                  <span class="text">{{ item.title }}</span>
+                  <span class="text">{{ item.caseTitle }}</span>
                 </router-link>
               </li>
             </ul>
@@ -87,6 +87,7 @@ import portalHeader from '@/components/PortalHeader.vue'
         ankingList: [],//排行数据1
         Popularity: [],//排行数据2
         Positive: [],//排行数据3
+        recommendRank: [],
         switch: {
           'total': '总',
           'quarter': '季度',
@@ -98,21 +99,29 @@ import portalHeader from '@/components/PortalHeader.vue'
     mounted() {
       this.getPopularity();
       this.getPositive();
+      this.getQueryRecommendRank()
     },
     methods: {
       getPopularity() {
-        apiCase.queryPraises(5).then(res => {
-          if (res.status == 200) {
-            this.Popularity = [...res.result,...res.result];
+        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 1 : 2).then(res => {
+          if(res.status == 200) {
+            this.Popularity = res.result
           }
-        });
+        })
       },
       getPositive() {
-        apiCase.queryComments(5).then(res => {
-          if (res.status == 200) {
-            this.Positive = [...res.result,...res.result];
+        apiCase.queryCommentsNew(10,this.favorableName == '季度' ? 1 : 2).then(res => {
+          if(res.status == 200) {
+            this.Positive = res.result
           }
-        });
+        })
+      },
+      getQueryRecommendRank(){
+        apiCase.queryRecommendRank(10).then(res => {
+          if(res.status == 200) {
+            this.recommendRank = res.result
+          }
+        })
       },
       imgNumBlue(index){
         return 'listblue0' + (index+1)
@@ -129,9 +138,11 @@ import portalHeader from '@/components/PortalHeader.vue'
       },
       positiveReview(e){
         this.favorableName = this.switch[e]
+        this.getPositive()
       },
       popularityReview(e){
         this.popularityName = this.switch[e]
+        this.getPopularity()
       },
     },
   }
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index e6625b04..912b6bc1 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -304,7 +304,7 @@
             <ul class="ranking-data">
               <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
                 style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                <router-link :to="'/case/detail?id=' + item.id">
+                <router-link :to="'/case/detail?id=' + item.caseId">
                   <span class="portal-right-text blue-one" v-if="index == 0">
                     <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
                   </span>
@@ -320,7 +320,7 @@
                   <span class="portal-right-text" v-if="index == 4">
                     <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                   </span> -->
-                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
                 </router-link>
               </li>
             </ul>
@@ -341,7 +341,7 @@
             <ul class="ranking-data">
               <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
                 style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                <router-link :to="'/case/detail?id=' + item.id">
+                <router-link :to="'/case/detail?id=' + item.caseId">
                   <span class="portal-right-text orange-one" v-if="index == 0">
                     <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                   </span>
@@ -357,7 +357,7 @@
                   <span class="portal-right-text" v-if="index == 4">
                     <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                   </span>
-                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
                 </router-link>
               </li>
             </ul>
@@ -365,9 +365,9 @@
           <div class="portal-ranking ranking-bg2" style="margin-top:26px">
             <p class="ranking-title">推荐榜</p>
             <ul class="ranking-data">
-              <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
+              <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
                 style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                <router-link :to="'/case/detail?id=' + item.id">
+                <router-link :to="'/case/detail?id=' + item.caseId">
                   <span class="portal-right-text blue-one" v-if="index == 0">
                     <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
                   </span>
@@ -377,7 +377,7 @@
                   <span class="portal-right-text blue-three" v-if="index == 2">
                     <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
                   </span>
-                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
                 </router-link>
               </li>
             </ul>
@@ -514,6 +514,7 @@ export default {
       ankingList: [],//排行数据1
       Popularity: [],//排行数据2
       Positive: [],//排行数据3
+      recommendRank: [],
       protocolDialogVisible: false,
       protocolConfirmButton: true,
       years: [],
@@ -811,6 +812,7 @@ export default {
     //打开排行榜下边的两个
     this.getPopularity();
     this.getPositive();
+    this.getQueryRecommendRank()
     this.couresreso();
     // window.addEventListener("scroll", this.handleScroll);
     // 获取年
@@ -824,9 +826,11 @@ export default {
   methods: {
     positiveReview(e){
       this.favorableName = this.switch[e]
+      this.getPositive()
     },
     popularityReview(e){
       this.popularityName = this.switch[e]
+      this.getPopularity()
     },
     handleType(msg){
       this.queryCondition.type = msg
@@ -1584,40 +1588,58 @@ export default {
       });
     },
     getPopularity() {
-      apiCase.queryPraises(5).then(res => {
-        if (res.status == 200) {
-          this.Popularity = res.result.slice(0,3);
-          // if (res.result.length < 5) {
-          //   for (let i = 0; i = (5 - res.result.length); i++) {
-          //     this.Popularity.push({
-          //       authorName: '',
-          //       count: 1,
-          //       id: '',
-          //       title: '',
-          //     })
-          //   }
-          // }
+      // apiCase.queryPraises(5).then(res => {
+      //   if (res.status == 200) {
+      //     this.Popularity = res.result.slice(0,3);
+      //     // if (res.result.length < 5) {
+      //     //   for (let i = 0; i = (5 - res.result.length); i++) {
+      //     //     this.Popularity.push({
+      //     //       authorName: '',
+      //     //       count: 1,
+      //     //       id: '',
+      //     //       title: '',
+      //     //     })
+      //     //   }
+      //     // }
 
+      //   }
+      // });
+      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 1 : 2).then(res => {
+        if(res.status == 200) {
+          this.Popularity = res.result
         }
-      });
+      })
     },
     getPositive() {
-      apiCase.queryComments(5).then(res => {
-        if (res.status == 200) {
-          this.Positive = res.result.slice(0,3);
-          // if (res.result.length < 5) {
-          //   for (let i = 0; i = (5 - res.result.length); i++) {
-          //     this.Positive.push({
-          //       authorName: '',
-          //       count: 1,
-          //       id: '',
-          //       title: '',
-          //     })
-          //   }
+      // apiCase.queryComments(5).then(res => {
+      //   if (res.status == 200) {
+      //     this.Positive = res.result.slice(0,3);
+      //     // if (res.result.length < 5) {
+      //     //   for (let i = 0; i = (5 - res.result.length); i++) {
+      //     //     this.Positive.push({
+      //     //       authorName: '',
+      //     //       count: 1,
+      //     //       id: '',
+      //     //       title: '',
+      //     //     })
+      //     //   }
 
-          // }
+      //     // }
+      //   }
+      // });
+      apiCase.queryCommentsNew(3,this.favorableName == '季度' ? 1 : 2).then(res => {
+        if(res.status == 200) {
+          this.Positive = res.result
         }
-      });
+      })
+    },
+
+    getQueryRecommendRank(){
+      apiCase.queryRecommendRank(3).then(res => {
+        if(res.status == 200) {
+          this.recommendRank = res.result
+        }
+      })
     },
 
     jumpRouter(item) {

From a59d1cea930cfe32453db2a7ca1bcbcfbcc3b5ef Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 10 Sep 2024 11:10:58 +0800
Subject: [PATCH 02/12] =?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/api/modules/cases.js             |  29 +++-
 src/components/Portal/authorInfo.vue |   8 +-
 src/views/case/ManageList.vue        | 197 ++++++++++++++++++++++++++-
 src/views/portal/case/Excellent.vue  |  67 +++++----
 src/views/portal/case/Index.vue      |  94 +++++++++++--
 5 files changed, 340 insertions(+), 55 deletions(-)

diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index ba64b45f..46ad3d60 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -1,6 +1,6 @@
 /* 案例模块的相关处理*/
 import ajax from '@/utils/xajax.js'
-
+import ajaxs from '@/api/ajax.js'
 /**首页查询
  * pageSize
  * orderField
@@ -195,11 +195,30 @@ const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/record
 const caseYears = function (query = {}) {
   return ajax.post('/xboe/m/boe/cases/caseYears', query);
 }
-
-
-
-
+//案例推荐榜单
+const getQueryRecommendRank = function (params) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${params.pageSize}`)
+}
+//案例上榜
+const riseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/riseIntoRank?caseId=${data.caseId}`)
+//取消上榜
+const cancelRiseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/cancelRiseIntoRank?caseId=${data.caseId}`)
+//调整榜单
+const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${data.caseIds}`)
+//收藏案例
+const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
+//浏览记录
+const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}`)
+//浏览量TOP榜单
+const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
 export default {
+  getQueryRecommendRank,
+  queryPopularityOfMajor,
+  queryViewRecord,
+  queryFavoriteCaseOfIndex,
+  riseIntoRank,
+  cancelRiseIntoRank,
+  adjustRank,
   indexList,
   queryList,
   queryListV2,
diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index d2bc7f50..159bade5 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -15,7 +15,7 @@
 		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
-      <span class="comWords">20篇最佳案例</span>
+      <span style="margin-right: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
     </div>
     <slot />
 	</div>
@@ -50,6 +50,12 @@
       onlyAvatar:{
         type:Boolean,
         default:false
+      },
+      authorTags: {
+        type:Array,
+        default(){
+          return []
+        }
       }
 		},
     data(){
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index 8b82c238..96cf5cfa 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -32,6 +32,9 @@
           </div>
         </div>
       </div>
+      <div style="margin: 5px 0 0 5px;">
+        <el-button type="primary" @click="recoRanking">推荐榜单</el-button>
+      </div>
     </div>
     <el-table style="100%" :data="caseList" border stripe>
       <el-table-column label="标题" prop="title" show-overflow-tooltip>
@@ -49,6 +52,7 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
+            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''" @click="suggest(scope.row)" icon="el-icon-delete">榜单推荐</el-button>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
             <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
               @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>
@@ -56,9 +60,12 @@
               @click="setTop(scope.row)" icon="el-icon-bottom">取消置顶</el-button>
             <el-button type="text" icon="el-icon-medal"
               v-if="scope.row.filePath && scope.row.confidentialityLevel == '内部'"><span @click="cancal(scope.row)"
-                v-if="scope.row.excellent">取消最佳</span><span @click="open(scope.row)" v-else>最佳案例</span></el-button>
+                v-if="scope.row.excellent">取消最佳</span>
+                <!-- <span @click="open(scope.row)" v-else>最佳案例</span> -->
+                <span @click="theBest(scope.row)" v-else>最佳</span>
+              </el-button>
             <el-button style="margin:0 5px" type="text" @click="delItem(scope.row)" icon="el-icon-delete">删除</el-button>
-            <el-button style="margin:0 5px" type="text" @click="theBest(scope.row)" icon="el-icon-delete">最佳</el-button>
+            <!-- <el-button style="margin:0 5px" type="text" @click="theBest(scope.row)" icon="el-icon-delete">最佳</el-button> -->
           </el-button-group>
         </template>
       </el-table-column>
@@ -157,6 +164,36 @@
         <el-button type="primary" @click="parameBest">确 定</el-button>
       </span>
     </el-dialog>
+    <el-drawer
+      title="推荐榜单"
+      :visible.sync="RankingShow"
+      size="70%">
+      <div style="padding: 10px 20px 80px">
+        <el-table :data="tableData" border stripe>
+          <el-table-column
+            type="index"
+            width="50">
+          </el-table-column>
+          <el-table-column label="案例标题" prop="caseTitle"></el-table-column>
+          <el-table-column label="作者名称" prop="caseAuthor"></el-table-column>
+          <el-table-column label="上榜人" prop="caseAuthor"></el-table-column>
+          <el-table-column label="上榜时间" prop="recommendRankPusTime"></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button-group>
+                <el-button style="margin:0 5px" type="text" @click="handleNotRank(scope.row)" icon="el-icon-top">取消推荐</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveUp(scope.row,scope.$index)" icon="el-icon-delete">上移排序</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveDown(scope.row,scope.$index)" icon="el-icon-delete">下移排序</el-button>
+              </el-button-group>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="rank_footer">
+        <el-button @click="closeDrawer" style="width: 130px;height:40px;margin-right: 30px;" type="default">取消</el-button>
+        <el-button @click="queryList" style="width: 130px;height:40px;margin-right: 15px;" type="primary">确定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -167,8 +204,12 @@ export default {
   name: 'articleItems',
   data() {
     return {
+      adminList: [],
+      caseType: process.env.VUE_APP_CASE_TYPE,
+      RankingShow: false,
       bestYear: '',
       bestOrg: '',
+      bestId: '',
       bestTextarea: '',
       bestValue: false,
       excellent: false,
@@ -179,6 +220,8 @@ export default {
         excellent: '',
       }, //查询对象
       caseList: [], //案例列表
+      tableData: [],
+      caseIds: '',
       count: 0,
       recommend: {
         dlgShow: false,
@@ -211,16 +254,149 @@ export default {
   },
   mounted() {
     this.getData();
+    this.getList();
+    apiCase.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
+      if(res.code == 200){
+        this.adminList = res.result;
+      }
+    })
+  },
+  watch:{
+    RankingShow(val){
+      if(val){
+        this.getList()
+      }
+    }
   },
   methods: {
+    orgDomainTranslate(code) { // 组织领域翻译
+      if (code == '') {
+        return
+      }
+      let name = '';
+      let data = this.adminList.find(item => {
+        return item.code == code;
+      });
+      if (data) {
+        name = data.name;
+      }
+      return name;
+    },
+    suggest(record){
+      this.$confirm('你确认要推荐此案例么?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        apiCase.riseIntoRank({caseId:record.id}).then(res=>{
+          if(res.status == 200 ){
+            this.$message.success('成功')
+            this.getData()
+          }
+        }).catch(()=>{
+          this.$message.error('失败')
+        })
+      })
+    },
+    handleNotRank(record){
+      this.$confirm('你确认要取消推荐么?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        apiCase.cancelRiseIntoRank({caseId:record?.caseId}).then(res=>{
+          if(res.status == 200){
+            this.$message.success('取消推荐成功')
+            this.getList()
+            this.getData()
+          }
+        }).catch(()=>{
+          this.$message.error('取消推荐失败')
+        })
+      })
+    },
+    moveUp(row,index){
+      console.log(row,index,'index')
+      if(index == 0){
+        this.$message.error('已经排到第一位了')
+        return
+      }
+      this.swapArray(this.tableData,index,index-1)
+    },
+    moveDown(row,index){
+      if(index == this.tableData.length - 1){
+        this.$message.error('已经排到最后一位了')
+        return
+      }
+      this.swapArray(this.tableData,index,index+1)
+    },
+    swapArray(arr, index1, index2){
+      const temp = arr[index1];
+      arr.splice(index1, 1);
+      arr.splice(index2, 0, temp);
+    },
+    getList(){
+      apiCase.getQueryRecommendRank({pageSize:3}).then(res=>{
+        console.log(res,'res')
+        if(res.status == 200){
+          this.tableData = res.result
+          this.caseIds = res.result.map(item=>item.caseId).join(',')
+        }
+      })
+    },
     notBest(){
       this.bestValue = false
       this.bestYear = ''
       this.bestOrg = ''
+      this.bestId = ''
       this.bestTextarea = ''
     },
     parameBest(){
-      this.notBest()
+      this.excellent = true;
+      let data = {
+        id: this.bestId,
+        excellent: this.excellent,
+        excellentReason: this.bestTextarea
+      }
+      apiCase.excellent(data).then(res=>{
+        if (res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '设置最佳案例成功!'
+            });
+            this.getData()
+          }else{
+            this.$message({
+              type: 'error',
+              message: '设置最佳案例失败!'
+            });
+          }
+          this.notBest()
+      })
+    },
+    recoRanking(){
+      this.RankingShow = true
+    },
+    closeDrawer(){
+      this.RankingShow = false
+    },
+    queryList(){
+      if(this.caseIds != this.tableData.map(item=>item.caseId).join(',')){
+        apiCase.adjustRank({caseIds:this.tableData.map(item=>item.caseId).join(',')}).then(res=>{
+          if(res.status == 200){
+            this.$message({
+              message: '调整成功',
+              type: 'success'
+            })
+          }
+        }).catch(()=>{
+          this.$message({
+            message: '调整失败',
+            type: 'error'
+          })
+        })
+      }
+      this.RankingShow = false
     },
     // 导出
     importList() {
@@ -405,6 +581,9 @@ export default {
     },
     theBest(item){
       this.bestValue = true
+      this.bestId = item.id
+      this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
+      this.bestYear = item.sysCreateTime.split('-')[0]
     },
     //添加推荐
     shareItem(item) {
@@ -519,6 +698,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.rank_footer{
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 80px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  background: #fff;
+  padding-right: 20px;
+}
 ::v-deep .el-dialog__header{
   border-bottom: 1px solid #909399;
 }
diff --git a/src/views/portal/case/Excellent.vue b/src/views/portal/case/Excellent.vue
index cdd640bd..f9aaebf1 100644
--- a/src/views/portal/case/Excellent.vue
+++ b/src/views/portal/case/Excellent.vue
@@ -11,17 +11,17 @@
         <div class="ex_select">
           <div class="ex_left">
             <div style="margin-right: 12px;">
-              <el-select clearable v-model="majorValue" @change="majorChange" placeholder="请选择专业">
+              <el-select v-model="majorValue" @change="majorChange" placeholder="请选择专业">
                 <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                  v-for="item in speciData"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
                 </el-option>
               </el-select>
             </div>
             <div>
-              <el-select clearable v-model="monthValue" @change="monthChange" placeholder="请选择月份">
+              <el-select v-model="monthValue" @change="monthChange" placeholder="请选择月份">
                 <el-option
                   v-for="item in optionsMonth"
                   :key="item.value"
@@ -44,12 +44,12 @@
                     <div class="case-tittext">
                       <span class="title-line-ellipsis" v-html="item.title"></span>
                     </div>
-                    <div class="case-activeText" @click.stop="toExcellent(item)">
+                    <!-- <div class="case-activeText" @click.stop="toExcellent(item)">
                       <span v-if="item.breCommend" class="comWords"
                         style="background-color:rgba(232, 139, 72);">荐</span>
                       <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span>
                       <span class="comWords" style="background-color:orange">2024年度最佳</span>
-                    </div>
+                    </div> -->
                     <div class="case-info-date portal-time">
                       <i class="el-icon-time"></i>
                       <time-show :time="item.sysCreateTime"></time-show>
@@ -139,26 +139,12 @@ import apiPlace from "@/api/phase2/place.js"
     },
     data() {
       return {
-        options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
+        majorId: '',
+        rankMonth: '',
         optionsMonth: 
           [...Array(12)].map((item,i)=>{
             return{
-                value: i+1,
+                value: i+1 + '',
                 label: (i+1)+'月'
               }
           })
@@ -176,7 +162,7 @@ import apiPlace from "@/api/phase2/place.js"
         treeList:[],
         queryCondition: {
           pageIndex: 1,
-          pageSize: 5,
+          pageSize: 10,
           majorType: '', //专业分类code
           excellent: true,
           keyWord: '',
@@ -201,7 +187,12 @@ import apiPlace from "@/api/phase2/place.js"
       }
     },
     mounted() {
+      this.majorValue = this.$route.query.majorName
+      this.monthValue = this.$route.query.riseRankTime.split('-')[1] + '月'
       this.getCaseData()
+      apiCase.majorTypes().then(res=>{
+        this.speciData = res.result;
+      })
       Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
         if (rs[0].code == 200) {
           const {records} = rs[0].data
@@ -294,10 +285,14 @@ import apiPlace from "@/api/phase2/place.js"
     },
     methods: {
       majorChange(e){
-
+        this.majorId = e
+        this.getCaseData()
       },
       monthChange(e){
-        // console.log(e,'xixixix')
+        const mon =  e.length == 1 ? '0'+e : e
+        const arr = this.$route.query.riseRankTime.split('-')
+        this.rankMonth = arr[0] + '-' + mon + '-' + arr[2]
+        this.getCaseData()
       },
       orgDomainTranslate(code) { // 组织领域翻译
         if (code == '') {
@@ -424,11 +419,13 @@ import apiPlace from "@/api/phase2/place.js"
           }
         });
         this.queryCondition.majorType = majorTypeList.join(',');
-        await apiCase.queryListV2(this.queryCondition).then((res) => {
+        this.queryCondition.majorId = this.majorId || this.$route.query.majorId
+        this.queryCondition.rankMonth = (this.rankMonth || this.$route.query.riseRankTime) + ' 00:00:00'
+        await apiCase.queryPopularityOfMajor(this.queryCondition).then((res) => {
           if (res.status == 200) {
-            if (res.result.list.length > 0) {
+            if (res.result.length > 0) {
               this.isSeach = false;
-              res.result.list.forEach(item => {
+              res.result.forEach(item => {
                 item.majorType = item.majorType ? item.majorType.split(",") : [];
                 item.isAll = false;
                 item.authorInfo = {
@@ -440,14 +437,14 @@ import apiPlace from "@/api/phase2/place.js"
                 };
               });
             }
-            console.log(res?.result?.list ,'有没有数据');
-            this.caseList.list = res.result.list
-            if(this.caseList.list.length == 0){
+            console.log(res?.result,'有没有数据');
+            this.caseList.list = res.result
+            if(this.caseList.length == 0){
               this.isSeach = true
             }else{
               this.isSeach = false
             }
-            this.getCaseUserData(res.result.list);
+            this.getCaseUserData(res.result);
             // 给所有的赋值
             this.caseList.count = res.result.count;
             this.caseList.showPagCount = res.result.count;
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 912b6bc1..b8470d40 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -199,12 +199,15 @@
                         <div class="case-tittext">
                           <span class="title-line-ellipsis" v-html="item.title"></span>
                         </div>
-                        <div class="case-activeText" @click.stop="toExcellent(item)">
-                          <span v-if="item.breCommend" class="comWords"
+                        <div class="case-activeText">
+                          <!-- <span v-if="item.breCommend" class="comWords"
                             style="background-color:rgba(232, 139, 72);">荐</span>
-                          <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span>
-                          <span class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 3px 12px 4px 9px;">
-                            2024年度最佳
+                          <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
+                          <span v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 3px 12px 4px 9px;">
+                            {{item.excellentTag}}
+                          </span>
+                          <span @click.stop="toExcellent(tag)" v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 3px 12px 4px 9px;">
+                            {{tag.tagName}}
                           </span>
                         </div>
                         <div class="case-info-date portal-time">
@@ -217,7 +220,7 @@
                   <!-- </router-link> -->
                   <div style="height:58px;padding-top:14px ">
                     <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"
-                      :sex="item.authorInfo.sex" :aid="item.authorInfo.aid">
+                      :sex="item.authorInfo.sex" :authorTags="item.authorTags" :aid="item.authorInfo.aid">
                       <template>
                         <div v-if="item.breCommend"
                           style="padding-top: 6px;flex: 1;display: flex;justify-content: flex-end;color: #999;font-size: 12px;">
@@ -531,7 +534,7 @@ export default {
         caseType: '',
         authorName: '',
         notInIds: [],
-        type: 'excellent',
+        type: 'all',
         userId: '',
         parent: '',
         children: [],
@@ -916,8 +919,7 @@ export default {
       this.$router.push({ path: '/case/detail', query: { id } });
     },
     toExcellent(item){
-      console.log(item,'xixi')
-      this.$router.push({path:'/case/excellent',query:{id:item.id}})
+      this.$router.push({path:'/case/excellent',query:{majorId:item.majorId,majorName:item.majorName,riseRankTime:item.riseRankTime.split(' ')[0]}})
     },
     tylClick() {
       window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
@@ -1228,6 +1230,8 @@ export default {
       if(this.pubTimeNum != 0){
         this.pageViewNum = 0;
       }
+      this.queryCondition.orderField = 'sysCreateTime'
+      this.queryCondition.orderAsc = this.pubTimeNum == 2 ? true : this.pubTimeNum == 1 ? false : ''
       this.search(true);
     },
     searchPageView(){
@@ -1238,6 +1242,8 @@ export default {
       if(this.pageViewNum != 0){
         this.pubTimeNum = 0;
       }
+      this.queryCondition.orderField = 'views'
+      this.queryCondition.orderAsc = this.pageViewNum == 2 ? true : this.pageViewNum == 1 ? false : ''
       this.search(true);
     },
     searchexcellent(num) {
@@ -1410,8 +1416,74 @@ export default {
       //   this.caseList.list = [];
       // }
       this.moreState = 2;
-      this.queryCondition.pubTimeNum = this.pubTimeNum
-      this.queryCondition.pageViewNum = this.pageViewNum
+      // this.queryCondition.pubTimeNum = this.pubTimeNum
+      // this.queryCondition.pageViewNum = this.pageViewNum
+      if(this.queryCondition.type == 'collect'){
+        const params = {
+          pageIndex:this.queryCondition.pageIndex,
+          pageSize:10,
+          orderField:this.queryCondition.orderField,
+          orderAsc:this.queryCondition.orderAsc
+        }
+        await apiCase.queryFavoriteCaseOfIndex(params).then(res=>{
+          if(res.status == 200){
+            if(res.result.list.length > 0){
+              this.isSeach = false;
+              res.result.list.forEach(item => {
+                item.majorType = item.majorType ? item.majorType.split(",") : [];
+                item.isAll = false;
+                item.authorInfo = {
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+                };
+              });
+              this.caseList.list = res.result.list
+              console.log(res.result.list ,'有没有1111数据')
+              this.getCaseUserData(res.result.list);
+              // 给所有的赋值
+              this.caseList.count = res.result.count;
+              this.caseList.showPagCount = res.result.count;
+            }
+          }
+        })
+        return
+      }
+      if(this.queryCondition.type=='time'){
+        const data = {
+          pageIndex: this.queryCondition.pageIndex,
+          pageSize: 10,
+          contentType: 3,
+          aid: this.userInfo.aid || '965628977500655616',
+          hidden: '',
+        }
+        await apiCase.queryViewRecord(data).then(res=>{
+          if(res.status == 200){
+            if(res.result.list.length > 0){
+              this.isSeach = false;
+              res.result.list.forEach(item => {
+                item.majorType = item.majorType ? item.majorType.split(",") : [];
+                item.isAll = false;
+                item.authorInfo = {
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+                };
+              });
+              this.caseList.list = res.result.list
+              this.getCaseUserData(res.result.list);
+              // 给所有的赋值
+              this.caseList.count = res.result.count;
+              this.caseList.showPagCount = res.result.count;
+            }
+          }
+        })
+        return
+      }
       await apiCase.queryListV2(this.queryCondition).then((res) => {
         if (res.status == 200) {
           if (res.result.list.length > 0) {

From 1278260812dc0172848af7dca7d8164d7382bdbd Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 10 Sep 2024 16:07:18 +0800
Subject: [PATCH 03/12] =?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/assets/images/case/Frame(1).png   | Bin 0 -> 467 bytes
 src/assets/images/case/Frame(10).png  | Bin 0 -> 412 bytes
 src/assets/images/case/Frame(11).png  | Bin 0 -> 474 bytes
 src/assets/images/case/Frame(12).png  | Bin 0 -> 427 bytes
 src/assets/images/case/Frame(13).png  | Bin 0 -> 471 bytes
 src/assets/images/case/Frame(14).png  | Bin 0 -> 424 bytes
 src/assets/images/case/Frame(15).png  | Bin 0 -> 461 bytes
 src/assets/images/case/Frame(16).png  | Bin 0 -> 689 bytes
 src/assets/images/case/Frame(17).png  | Bin 0 -> 625 bytes
 src/assets/images/case/Frame(2).png   | Bin 0 -> 514 bytes
 src/assets/images/case/Frame(3).png   | Bin 0 -> 665 bytes
 src/assets/images/case/Frame(4).png   | Bin 0 -> 576 bytes
 src/assets/images/case/Frame(5).png   | Bin 0 -> 475 bytes
 src/assets/images/case/Frame(6).png   | Bin 0 -> 528 bytes
 src/assets/images/case/Frame(7).png   | Bin 0 -> 476 bytes
 src/assets/images/case/Frame(8).png   | Bin 0 -> 540 bytes
 src/assets/images/case/Frame(9).png   | Bin 0 -> 387 bytes
 src/assets/images/case/Frame.png      | Bin 0 -> 413 bytes
 src/components/Portal/authorInfo.vue  |   2 +-
 src/components/Portal/comments.vue    |  36 ++++++++++-
 src/components/Portal/interactBar.vue |  89 ++++++++++++++++++++++++--
 src/views/case/ManageList.vue         |  19 +++---
 src/views/portal/case/Excellent.vue   |   3 -
 src/views/portal/case/Index.vue       |  68 ++++++++++++++------
 24 files changed, 176 insertions(+), 41 deletions(-)
 create mode 100644 src/assets/images/case/Frame(1).png
 create mode 100644 src/assets/images/case/Frame(10).png
 create mode 100644 src/assets/images/case/Frame(11).png
 create mode 100644 src/assets/images/case/Frame(12).png
 create mode 100644 src/assets/images/case/Frame(13).png
 create mode 100644 src/assets/images/case/Frame(14).png
 create mode 100644 src/assets/images/case/Frame(15).png
 create mode 100644 src/assets/images/case/Frame(16).png
 create mode 100644 src/assets/images/case/Frame(17).png
 create mode 100644 src/assets/images/case/Frame(2).png
 create mode 100644 src/assets/images/case/Frame(3).png
 create mode 100644 src/assets/images/case/Frame(4).png
 create mode 100644 src/assets/images/case/Frame(5).png
 create mode 100644 src/assets/images/case/Frame(6).png
 create mode 100644 src/assets/images/case/Frame(7).png
 create mode 100644 src/assets/images/case/Frame(8).png
 create mode 100644 src/assets/images/case/Frame(9).png
 create mode 100644 src/assets/images/case/Frame.png

diff --git a/src/assets/images/case/Frame(1).png b/src/assets/images/case/Frame(1).png
new file mode 100644
index 0000000000000000000000000000000000000000..90d9a10404aa476ce4b85abf01842c1c0c689490
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$jY&j7R5(wKQM*b5Q4l?I#SgHtx7HByFeD_ztO$yYh?Rv}So#ye)<(z|h**e)
zDHIgn=1F#wXku?G1X2kGF?V$C#x+X73|q|XJ?EY?=Mo0g$xVI}Oc?-Khu+uImi6%$
zMuUlkBSo}g&RDN5T8YD<h-bIOV-PI?1TfMIsp$4l#PhqdO^QOyMsaO^CU)>I@iJ#`
zF>!{OiHL;y0!Bx~ztrV}QrM-dd}W6TskwM$`l4Vr6)-6z0SH#eGMk}S1bU<EqQfBY
zY%Hv<i;iZvN}i&ek`Z#VGEVSJH>Ij{oQek3ZMmvhfITHKCNp_N&u^CQD|IcvWF(;O
zq-U`wH~)^q{Oj4*n$wiCAGF9PBLUNY+fib7&?B3Sc$xC{gP7q&*sluCqapsSzJy&>
zH9A4XTEi&DLw?iulOz?*T3mWI8EC~r{&6bTn{8%{#ezO6)fy%!_aTgFZ)JA{v;KZG
z=v$|9qY>h+nu-Oc_Dc1qjUUA>6h_=p0nh*|yuP(tr<P@PJ^=&X$U@m0_ErD@002ov
JPDHLkV1k$K&G-NS

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(10).png b/src/assets/images/case/Frame(10).png
new file mode 100644
index 0000000000000000000000000000000000000000..1f8c9a64d57fa1b5aa8ca39350ed736de2729ba4
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$R!KxbR5(wKlCdkrQ545N-|J<!*v)LRqm)5O22mK4<^2;ct3?@PQRt}`@)R+M
z!D#dcSe2L*!+YoG-uwIUyk2pZd+xpGd%oZAxmWZE-)0Ti2AaIGq8hF4GW7!54#$Fd
z2V^X&O5=aPUCtDkO+crnbvFJ7+~YxF)E&%OuB=i26X*w2qd$je!v)X4X9-LyU`y>f
zn-b$;i7`9kQ84VDKskidxzDE`vIen<hXsN)uvjYa2v#W8xc{M)#FOj<mvGG!>=Y}z
z$Fo!%+2ValOA$2X=ZOW)63V=&&4q=j1dPUWhnoB%4i1GGWEZ(fWGNZ5?qX6UqcJDD
zN@6@r6YLu6l=MBIQbM6X{S3)&vac|OJm$Z>M7HkV^%ABSl-==$GY}?`-DdV*tlzTp
zv&uQtBrEcJM%yh$DiiFt?pRIo0z~e<xORqkr_H4%`1}H1_?Dm7s8=!o0000<MNUMn
GLSTZ7D7~cs

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(11).png b/src/assets/images/case/Frame(11).png
new file mode 100644
index 0000000000000000000000000000000000000000..faed6b489a0ba614f0b6895fc6299800ce0e936b
GIT binary patch
literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$lu1NER5(wCl0Qh4VI0Rl-{;cv<OUBqkfy_i8jKnXjL^kJ5Q)YHhoC8Na+F(Y
z3?iq3pa>!dmk^@C!5eH#Xpj<f2tp~i3+h$S_nXgqchV~t{f1|Fp6{Q}!}ExLj2|(d
z!f@dpbG;<$wdscpxyTow*gD``Wsc@)U2o$P7JvmGFNS*I4)y;U{fr@C+hzl}0W@1;
zq%xatm7g;SjHad*0_QQKz;{gDVmU)HTZRn<J_1`D@j>Ye)(DKX&v_bPos@<HuYfBE
zABW_wB>1eoMatDGD^9tNXaHvf7i=mD*hT`!`(|S{e<w_2Nqes;pAD=a#=7ZJM;zOP
zqtK?IK5l86-4ldpuJ-c@G2GEc^o&0PH9IPCNt67F+d2014L^Z$Z0$Dw#kmuv80iw9
z7?Wjc#S+`?@Ke*p{l=hX+0Qll9XAn69lEBESPW2h;4Ux_^HkuPCU~DWu4X@FUgmML
z#r?`m`@s+1a<Q+U2cT);+ZyL(&X}xH8z_<JD!V=Z?;4krLw*d7^EICT0k5Kw0*srQ
QfB*mh07*qoM6N<$g6zA{1^@s6

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(12).png b/src/assets/images/case/Frame(12).png
new file mode 100644
index 0000000000000000000000000000000000000000..91676aa086feb4502f03b8e5f16ba05edcea325f
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$Wl2OqR5(wqlD$itQ5eO4=gn)$*ug<i&_6(^r9zg1gw9UIK^)R0STt^RceBtX
zIN3pjeo#e39159QhYU)g=pZf*26S+9Gf3Wh%6*eo+b%_Vhs(Xsx#yne<A{4M-IK>(
zM6d7&^As2gKmz9!*i((;yCT1ceoM)L*MbQH5;z{ZD_*}Ls(Q&$9*CRQcy4$P6l1`F
z13?{=I-!Or<#A|-z;s$=SALf(G%!UeVjN;7Ej~n1GUi-h3mEOGUkl0#pYjx*V1%&D
z0!133&8tMr8g?a`Hg9rb_uYxIZPpV}@hx#Nn2{u5KGrB$MYMqBpCubM<Q*Q8@*Nn-
zKQt|6l!KTdp_626lJX_uJ>sbz@VMKY&kR#w%VNBj&ZWg#gk)YI2J_~aef2S=XI$Kl
zW1V6cWL5<#h_UVvdhIYr3e;)xQA>30LcbZvU+KSr0YTaaXDV~`r^EiA<^I*XKLB6P
VdUvvlddvU-002ovPDHLkV1hj@wjuxk

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(13).png b/src/assets/images/case/Frame(13).png
new file mode 100644
index 0000000000000000000000000000000000000000..45d0ec2dce062f0997a172e074ecfd1b9285989c
GIT binary patch
literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$kx4{BR5(v%k~?b@VHAd+cXmu=5wHmeN$dpu2{vM*C`7>&3IQ)5skHLaxdBlE
zS{MY027)M9Sg6=2h^xQAW{VWsiQ+1`6k=F+=hZVaJMQH)A2a7X=RM#19WfNX&+e?t
zjl>)U#(^egSr=LEFIE4CSD12}24XrA?n_GC);w2wzXrhU0ndTs!Sq0>Y+w)^)CE2S
zT!F5WGRZoyGn9rDb3TJRwR2n^1Xme%!g^Fh*a(%%g&LW8R6E1j0WdFq!dJvZ4*kE3
zDVl_2y*9_f2-tnf^?!<W2?soMZYyJtPV;?Ku}<oJG=Kw2ayXm`_1}V1n&st)t8S38
z#VyPwOR0znLFR2|lbdOaPwc?_LAuJ9>Mq?^JQSQSoGHhIHGgAC8B2oH(1{aqEeHLY
z8E3qxTrB4iEV{)p%>Kw#hMAu^n7!c{;$)an2o@o@%LaQ5hlkefV*$S72e7NOz1kXJ
zQ*Gwl<{pWru;W=a)Zs`0zRy=J7Mk7@^b{<b$uAZ?#$!cuaYBdq{1<0&o&rG<fC2yj
N002ovPDHLkV1kty$AJI<

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(14).png b/src/assets/images/case/Frame(14).png
new file mode 100644
index 0000000000000000000000000000000000000000..ace9d1924079e67c0268496fc36eb9ee42044e27
GIT binary patch
literal 424
zcmV;Z0ayNsP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$Vo5|nR5(wal08eCVHAe1`%Tnz2uPPY_>q#q`~ztnLQ!;ZP)Kbm2({3`j?&e^
z)ydYO9XhCkXp6Rsf=kg-N-X{j@h51Yd7rzyF;Q%Upl5l8=Un%>&xg2Y=q{W;QVcO~
z1jB8?^Hq8ubWwI-9+9sD=J;07OQh*#+^#2&109XzM~24|D>p!|lLzJvvp`RxEjT4+
z*(sh2iUvZ=w7f<)os=AylNhc$F+$XA-p3J}X|n|s8uPGX`V_XQ07F1hJrNY<=x>#`
zomo<@u_rN*eAL67Mlb2V?DZ>y!AwOd%9t;jX4$)p8opt&iPW_!J1X(wMvoWY$z>u+
zhywyA7MW(DCTLhlP4b~-s_{ObB6EybyY$`kfAv1m1b<pUAMh?fK~R=iaKs{zYw%T_
z@lda+wt_zxu=u4KGaBQ!56KYtoUBMt(Fjiy`)x1hYM4KHMF2fx<4)lJH~kN%7kH}X
S#ugy}0000<MNUMnLSTYk0k`=8

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(15).png b/src/assets/images/case/Frame(15).png
new file mode 100644
index 0000000000000000000000000000000000000000..86fdb8a98500e176bd1f5bb1423b03e42e1f8569
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$he<?1R5(w4(y?n4K@`XF?{6-bqzJgIf)*C3%zt3&EF6M@g;o}VHiC$9_YZjg
zgJ7Ycf{hj;SfmlLGPQzO8Fsa>bwyHaxZM79#zT?;o$k%dXXd@f6WRLtfD>zhkAjo&
z$fnaWBVA+X@Kwd2f604b9Rp&3S(6e<OQHk1MYtO-aW=vE8=mAp|1&mwgAunAOex*t
z0%qyI4~PTZVLN5<7vAT)VHNXLferV3Q(yp`viT&~Fzkg}lt*CykXF!kbE=g<BQeGl
z7E=u=J)?<<g&R41Op6k(fEt(pg<&ev<vKPeT+iWCTHuG~Y<Y=BFz%uF-Q1}TC>c`6
zE{Cf*d`>IT(o<Qgg(rvtbC(s4v%i2>a`@s;jm)S#q%n*mOg{!n`bDajbNFge<DANa
z^m?i>!Jd-17i+wj!);mxS~@DPQmbb|ps<;0pVG@T2#51Ie9dRXY2bszreT+!Az~eP
zhqNjCi$<I|Isk7uXYmYi?C@a339%7kCUa9;Jc{ra)oqv$kZ0@N00000NkvXXu0mjf
DM1{+s

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(16).png b/src/assets/images/case/Frame(16).png
new file mode 100644
index 0000000000000000000000000000000000000000..3196a8b21ae081d1762f946a191f3f9c0498a11f
GIT binary patch
literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%Ye_^wR5(v<RLf3NQ50S46cRMV#5oBA2TV+gN&||I=;Vf=0|q7#8TbhjzrqnF
z{(uP*7??Pbl==dpK#Rq;aiSwM(GM^|FwmZ5&N=tqUXU|sx*uz=z4qRhIOP>TY({Nq
znueo*`UpbOFA-%3i+AsgE}cwc)=(^$2Xw^epc(Gi1>jhi18th_?#Z$1g>Ok*8c|%U
zMzHOd0DBz)mz+2qlzZ;KoJ-z$0Gf%ho5Q8Vhhq8DfU)g5z#bPE079A-o&e|~@z`4g
z(id`G?8)Q`j+xIXtyk&<^Vuds0tMKaz{kwSd^`f_K;<AS(XElIe7jK{m*s2E*C)mS
zsYrZe09fd0w!tLU+pNa;uDm@5@_|El&Xd2OX3%zoIGZh!1+vgQ-*41*N%Y$o2#&6o
zC}s!DI6j1#4XVY@#dTtSaAm7@2(T;lr!ogQtsD?rIpUe0SY{L{L*j@lm7POL-JV8V
zA;?9AQS&4I{+>Y3xdjqYXBC{zVGjVcxLWzV3!*=^#eE&$TR|o5n<@0z1!EX>x=UB#
zJ6E^sbCjk7p`c6l`4I<gmbK3*p4Eb3081LR7V})IHX=~V*@>M5N(%_3)*nsfdhv$f
zP|A$D=c}#P8e0%XPGjW)(us!6-XU>8()qY}^G0Ftk_Rd`n*(T}Mj^hlq*i=wnH_Tj
z38&)5kAp)UUA{du^ff)&%|;`F<tvD1l3PkPIngN`v%3yT)E=z8f9=X(=V+7qj+tp=
z(a_|>j`-;&Q%*J&lC5^-^stc6|Nj}u3S6y!8Mnlw0Y(A#1xEY{s!Z_3@Zd$yBK!UU
XLRLdM6v;@a00000NkvXXu0mjfv=}<d

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(17).png b/src/assets/images/case/Frame(17).png
new file mode 100644
index 0000000000000000000000000000000000000000..a267fc85ce584696219c04a4596202534d83fb74
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%D@jB_R5(v<ltF7#Q4oc{^P-^Gjr&3uF1i#&QR%LmP-+)l2n}{23NE@b_$yo~
z6kG^Op@sxeDpaviC<p}=l+vADRYCuN1PU56dhgtu_fm2Rc_DY^%sF#ro)~j%l{&DD
zG=teBQi%GA*$y>2TH*E4v>1_(J!BeK11`m6GrtN^7Qg)WKzqoRw8DPQ9Rk@S>J0Q8
zm_Pv`C60Sq_|pz4Sk!I0xfb@AX$I^foro18P69ISVH`ucn=s{tBEcR77j=vM$jF|s
z3!E)=WI<*OXi|&P?)!a`8%YsBKk6n|WNXZWUZvDrNijZ>vO5$J=)p*XLqzU?n3Juu
z4qV6Nl;bl5g=zuLnhC%e`F+wqgl@@NIzUV%nhxaM3n1a+Knl{btOQuv`d!x1ZwSq-
z$S-vTh$coKY1M(MZpNIz@Q>_S1Ul|jvl~gCGk8yrMNZL1VNl16h0&M2&;i(#`(2%%
zk=AzkMS}_26mja)Ni$;hO|}u5t>qEdj#}(&w=f!rHYkB5sb($NOX^5l6v?s7N~y8l
zd~ZB-`AdTuZ;>vzi}7l~jojqJf3V9VeJbha!ONC?0nT7L?c>6pu5!+S-h^e<=i#13
z#(51x#p;ZuKE{3HkiMPQ0$<CeeMcQ*19Y;KGQ3WcURgr39s{mvuClaQg>A>>?I8Ky
z`7Whtk212kpD4JY*)gw?s@b;9JYor$0VdO0`~cg*c&b@vQ9b_v<x=?HWhTRK00000
LNkvXXu0mjf7-k#c

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(2).png b/src/assets/images/case/Frame(2).png
new file mode 100644
index 0000000000000000000000000000000000000000..db89dcbaedd93442aa91749dd5218b009a2d0a1c
GIT binary patch
literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$yh%hsR5(wClD}(HaTLYR`6j;98nx1;IE8jlu<=<GNocG*6+{q3q+@qir;Z_u
z{sX$X3Zg?7sY8c{G&T*ErojxNrFL*BR1E$~t$p94-?Y^vJn@eAp3gn^UM}&Ecox2#
zhSkvZ%Y{2}62>KG!f?QY_Z~oM8{5Zk20^n|7YjarQ7IBA0)%W-x)zL={tG&{{=~sG
z0d;~G0X4rzt>Io*&Mj20D&i=q48airqX0HRmLScvorqOg)d@66t{Py4bLHwhX$p{>
z<RPF%15=Km#{|xhlq8~isds!5hUvl7;aNf#AeLc}q<F%@9&-=`2erGpknm>fhrQJ9
z6NX`$sUx#6D98!jbPj@?klY6?$~(rJypqdq{29Q(=Fri%5Qq5tq`Q-MhSmrA5?SB(
zzwNHw5%aHBJ_AU*os8S9qb6y6;{4d~e(JAdrIzsyn6<cv*gKAXe)-fN1i@C9<KlAt
zmIa^g9iVAtA0)`M#M`9$0E$ZF^XE=gyTD5AbrI4u$@{J5&fOpwYromT($Yyo?;Z?q
z$Z9Ho_VlA3u$Eym*~(?J8*$@S8x3DyqmQ|q|H0LN0sSJn0nPND&j0`b07*qoM6N<$
Ef?nwIK>z>%

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(3).png b/src/assets/images/case/Frame(3).png
new file mode 100644
index 0000000000000000000000000000000000000000..4d1f7349483b89b35d89efaee65388c05ec1077c
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%Q%OWYR5(wSlTS!gQ543%@A@V+qKsTfv=N2=AeJ_jW9smbNP}=OLJ+iY5iX^j
z8?hGRQrfu{iV0kbLP%Xk#%W5OGNFXB+_Y#_kVxUoJ$c_a<5Qm#oz=VVob!9%`ObaB
zKVs@dauh)I?asFQrAk>UIX$gwaP-I*g3cEHT<CG#&xh5Q1kLEw7|8*zSuoM<M*996
zG_7@wV)<86l?#Lfwu}=xf9ra9EeLj~qUUqzF%tboBtfW~mSjXGx;k0{Re7K(y;xm_
zY<*cs)hUsB5vd2!E2751+%rO@^C~1u;kZy%A!;?3%dK_0k#(ElZ1VLdl64}mAC>$V
z{3XB|oysn3ZH_~+2gr*T5$}PdSmPkr0Pv2p^9wOW#6=`zlP1TG8|~rbj831a45?_2
zd_vj|uibM!545bp0gpWT%k)Bw!Z<)j#C#`sLWl~#sf6vakUY$uZ5WuL&d8OKqS+n{
zDh|N0bw%k#noo^~vtaYUZ3#avXf2k`r86-hCikz``jQ9x!kE5jBs@`gb71{*Z{BVK
zyJHp1-3#Y>^jcHx-qC$0omxESgq#n%L+o?dZj?$yB%9s%aoly?-+_weGs`g;-)K8}
z#T*>XsIsQ^=7!~9(9-fS!Qnkth)EEvqT)rrS4MEJ?Q-MOKu{|4ev&{htg#}AZFe8G
zHa8}0@vEhkJ5VyZ{qxpZ<G1hKNTj)OC=is+tbByRPi18A>JGrKPHSCJSykN+!5~Q8
z($sJ_5Tvy}=DM!E@+HFp%TJy@)q3gdw?g4xuL|<(PYTb(00000NkvXXu0mjfg@!;x

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(4).png b/src/assets/images/case/Frame(4).png
new file mode 100644
index 0000000000000000000000000000000000000000..fd03bac68a389d6a6b727cc4a6290f60e2888c3b
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$`bk7VR5(wSk}+sgQ51&1KgPC$s9*;Nm(mRCBCZaK1#LIQ6cj-;h;|SZw=P8;
zN=K0*w37s@RU(LpgHQ|w2S;7BpwTW4;vy&_w&u6@zLzv<Un4$v@4>m}eD^=+KjI&c
zCz-(X>M|EPrK;1RZ?hBe5s|0PUR~nDM){pV)7%7IK@Rn0U8MBips1#cPl#?TA(qH{
zkIqrcf^DeCcY+#5s56fkM1s1@I-jj7f;>$xT@=XEPn`l#z#0Zmk>de%y&}1CImW~S
zITl!=rV@+cK)$Q@E8qS^z8(MY9b97*L;PV1=@`U0k)DUjG{6twwS1o<XcpKU4}Wt|
zXL;!vb|DTS&43+SYt)9T;)Q9z+(=q`*o5UVUy!$fdYUStlvusyA3`3}DaM<__9Kdz
z*|;-_OI}~N7UZiM=2qjHrkj2oV5+2h)51yT*Xp||=>+9QXr29jqMzWNBq5A}psu}3
zyr|>!wQ}1)e#&md+tqobLv6IV+VV1A*{Tx1G8Oq5MMNdtnKY-NDy&A!taI$w5O1<U
z&$+guA-ritbR}%|cErA><%#oWG|0Vd&>R&A8;v8tT-Q<N<BH625;Fnni;mjkI>J~s
z=!M>azX78fNC0g{RS71HU`Bze1~{D!s<K6g<H~n@9Dv>I&;dR-68{3VV8ELg^RNg2
O0000<MNUMnLSTYixCgHQ

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(5).png b/src/assets/images/case/Frame(5).png
new file mode 100644
index 0000000000000000000000000000000000000000..e2145e80dc81067508bbce51f55dcbec7ffa5275
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$l}SWFR5(wqlD%tGK@`P*XWrXnMMMz`LBah41b0zbk!W~U+gOQ(Sj0vGesuab
zDA=U55epTRRKX@Duul>-(T&j*YGYwQ3mZx2ve~^?W`rebBf+WWew=&G+&N;KN87~l
z7w}1Y@d#oJ)4@121pkt`p0!Soz28bQ1U_9{Y7Y8-3o(uZiluY`cOg0<%PzG}HrL{S
z1e{-3K5K9vsK(fgS3y1n<OWwIHB+P0b#cCR>iCT27G94_KI>4G6e-??FmlGM_W<O!
zxp`TYY+7*G9fI^@;Gt0aWv7F5)Xf!vhF{y^n(d0~f=PFu3Fx_t+le&E)<=~~Z|*5*
zA_0S3&JA;~NxG7jA?^s)9d4#LYJx{9%eQ;7om!QsrM&t2z$ikn3!uK49_N|bh+32i
z{%QAUXrwp4Sp9Ga?@fb_{gT5siMvr3=pxdA#ACj!ik~}CuYVnWM_HED(Or8dm1zQ0
zAFe$0+nU5wcjNoRqA2=XYrh$&Tv^#S;+6g6dETS<xo9*t{&d*?v)sRW_b2;Joh|Yh
R&Yb`N002ovPDHLkV1hg5+A#nC

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(6).png b/src/assets/images/case/Frame(6).png
new file mode 100644
index 0000000000000000000000000000000000000000..ffb2b7fd336c558ea9a3de9ca282cc7b40db6e92
GIT binary patch
literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$%1J~)R5(v%lD%tFQ5eRb=X$BtRtR({I8-+WyD5gY+NP*jD}G=X2M6&Fa8lf?
zAWA`p7MJ2Ajt<d5aA>$HTrEZnwH-RNn+T#*2T5|%<UD%LNzxm0hjY()-}m=^6aRgM
z!u$Odn0p|n31kehCTQ_|Zfr4a%Jkz^91jKCK_uvaldGwvyFQ$r7`fH5?*L!FS<VaQ
zB1n0KJw0ttHIzF$Ir6rpaf&F4!dkdz3qrqBkdUl7A&54p5gtvAXK!|Z`6$ZthkLhR
zO{{l`BwNXPnK4gKpU7V80PSNbE`9?rXrXp3q?{A)Z1&XgV|Tm2LR`G_PdIBM`Sf=F
zfT||wJ$N!Z{Jjgbb)t7)1aQoi=5w~eDl)n<IePSES63~xt1t6F(hY!NyPLvNWjncF
zu2(mD%x=|!gqL%<ukBjieJnj8aJ|`j*BC+T<v-O0Q40b?LUrquz-<S{#V;2G^TMZ>
z9<AoemE;_N!|4u7`02q<E6)MUFreDo;)|J2YRMsiXVP0lq2$01pI3j77%-{XHFxH>
zY1FSa3?7pla*ZN?ft+&Sa%nXWAmg{pM%|gC#5L9$bEb#S2n-m*OQT1IH~#|3m(Qyd
SgG2NH0000<MNUMnLSTY4T<lE%

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(7).png b/src/assets/images/case/Frame(7).png
new file mode 100644
index 0000000000000000000000000000000000000000..28483b662714d012a39bdb93848ed99b0721cae6
GIT binary patch
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$mPtfGR5(walCeu$VHCyB`I2ZX6{HS2SWR)z!6Jqf6NAKv;3}jx2tpk?q@%bx
zbaiT-I&>%wr4*`NinuhNpz%c#tb_O$xI1(a`|_RgUJ$AgMDKRF_jm6(mrFb_cpq-N
ze2{b08;IFE!A)!XI!s#;jwO(TfIy&nEBMaZXgcy}7S5GuI4db8p-RIZNzV-N{u=nJ
zQXg~;zvO^LfW0Io>5S4E4PFY&1=gH2&mY!yb;ceS1h+(*Y*3IyNIu99BEAs(3TZf~
zkr3JTl;uj@12L{3N4S9^b{pW^STq`e@Baia5Ez5Psb|yK7yY5s{aS74?<MDGSQPjz
zpGmG+?`Ve9mZZ)=a`XB@yZb(sPQAM3(RyCOMA{1xm>mbz0K`K=p~Nuc8q2wKYQ5#E
z`?cebpsIlREHxKhHH8_OnM{oywt#!};}ruA11w5frok$NMDxP#;_}b=lYBmZ(E?VE
zP6rJ9J<u#<#zrdE+IYOH`;&x41A6J?^NIge-1&KjzfWE}0GY9ojeCJNC;tP7cB1<*
SX|ucl0000<MNUMnLSTZnuGKLB

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(8).png b/src/assets/images/case/Frame(8).png
new file mode 100644
index 0000000000000000000000000000000000000000..ef20612e86b351fcdc64b9b03f864ffb7c3ad3d1
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$)=5M`R5(vvlD%#dK@^40*`L@264rtQ1w|^T_;V6WY{<`w5FwCw4hp3B1@My~
zN*(}00RjWTkOWMu02R?13R;FDlI^TL2WCy-^^s=g&Yk&m@142Cl%6!3Cj%D0fH*|}
z0{T9KwVO)|t;wtI49)G&djw_$fq)P2m@^zTp4bQA20$FFRLWN}@I!n5kp<uZaO<R|
zeFP4xa~JMspwrV=t=j~G>C`9p!x4se*J_*N!2h+`Z2cBkg!I!R&q??N%B6i;(l_U`
z(BYlcT9gByy?$>z()4UUF0jz`=xqop{VTH3x5cQyUYDe9EidN5=Wln60Aois_5&{g
zR2Ntx&<KY!(NQo++&ir=UCo0pwswuEKcm#H2BF`jFpfwzf;5aq;V^M2-nh1q2Vb^6
z8G116r?HA*Vud=X65%~y(L14@O&}qz&F8`9cH0m%(jW$Ax}Y{7mPj;I@FEVBfh&u1
zdGO8do<UY4V&6w1pbjAeM<F8rDDz>taybufee4*LCQWS|hTa6IM(QgHhU|jS_4!MA
zu+`rG4&e-l4v7lE1Hpz8X92w<SpoE;TE2KT_m4ZBuj^KN?2*TnwX8sn`@>4kO096O
eT0Z~K`ThbTR?rVIje$=90000<MNUMnLSTab7Vu^O

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame(9).png b/src/assets/images/case/Frame(9).png
new file mode 100644
index 0000000000000000000000000000000000000000..57dabd5ea2362b6bb76320a259a6690ef45a3a8d
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$JxN4CR5(v{k}*nyK@f$%7t(nZ!2_fdvC$%hH?Xj>(*t;hC@BQNLJ$l@NRcK1
zQ(9Vj1CI~{XJlt~e}l$tc4zm^?3?#SHev=G;RxXpxDy+Bj-V{Jz?66<8)JEkq`<{0
z*mm9;`)ww+YBkSWVr7sN>hH1p9ag9nniy{q&o#MHfnF)>4Ao;Vu;B80tfS{F5H~Gx
zb9cB93<_3`%O0?lA)1aFwQ6hD+k022h-i-i&c{s5c7DWa?Nw>3`t}qSG~l&PINwTj
z!r0-gy~(FlgOqXY@Gi-NMEy0u#;%Kgr>@Vcs%cj0wBc!IOZ7G4Vu#K7#OXKBe;fa2
z9tyx%%jcYWk7M9KVkbXrW56r$QCZ|Tr5%fU1Y0u28OFTA3twF6kkvM!+6ZRB6(e^B
hGA^~x^1p<3{|&(Mn#0P+*mnQ`002ovPDHLkV1gWfs!RX?

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/Frame.png b/src/assets/images/case/Frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7409f2fea20ed266e8daa52a0fbdefe68b700aa
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$S4l)cR5(w4QcFrhK@hAO+<6p5K_Q^71b4c~9bC9_rw8y1Djq{2poj@E-$(K^
z8gb(dJVFqhlIeN#@`UJYX1cq&ySjSVX!RPT+m}R=0)Xl}*bKhHA8a_+;B9;84GfTk
z3{gc_-=RVR-*qw{Y#%zN+N2^T^(yhDm-pR~mwcotOaa{#bO3K;0=K}a4q{!3%=pk7
z$0&_%ljLQA{&mUw6979AOR+h~JtR}5Do)A@J`<~2CUk5K@*rmn{&T0igkw8<vPADK
z@nUyt^LP=}b~d>pb)-Udc1Dw=K)}x=e1yiJgJQ7)s#O3>wvDj6?)b%Kj5Ak0fO9fL
zdFHDzJ^K0US5avm2~t?J*k2T<tRiW~em*@EbwF^>k<0TA)^G&yGy3Ked8t{dJbZq;
z22hXRj*t4**>-KMvq-4)r!1CD-p?JeL-Dk>vC{f0A^Cp*`~tzHgsMjH00000NkvXX
Hu0mjfTe`Fd

literal 0
HcmV?d00001

diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index 159bade5..bb6f8001 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -15,7 +15,7 @@
 		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
-      <span style="margin-right: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
+      <span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
     </div>
     <slot />
 	</div>
diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index 54c9fd15..3c925e0f 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -92,11 +92,19 @@
                       <div class="comment-btns">
 
                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
-                         <div v-show="btnsShowRowId==com.id">
+                         <div style="display: flex" v-show="btnsShowRowId==com.id">
 
-                           <a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
+                           <a style="display: flex;align-items: center;" @click="showReply(com)">
+                            <!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
+                              <div class="is_comment"></div>
+                              <span>回复</span> 
+                           </a>
                            <!--必须当前登录人是一个人-->
-                           <a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
+                           <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
+                            <!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
+                             <div class="is_remove"></div>
+                            <span>删除</span>
+                           </a>
                            <a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
                          </div>
                       </div>
@@ -960,6 +968,28 @@
         line-height: 35px;
         a{
           margin-right:15px;
+          &:hover{
+            .is_comment{
+              background: url('../../assets/images/case/Frame(9).png');
+              background-size: 100%;
+            }
+            .is_remove{
+              background: url('../../assets/images/case/Frame(15).png');
+              background-size: 100%;
+            }
+          }
+          .is_comment{
+            width: 16px;
+            height: 16px;
+            background: url('../../assets/images/case/Frame.png');
+            background-size: 100%;
+          }
+          .is_remove{
+            width: 16px;
+            height: 16px;
+            background: url('../../assets/images/case/Frame(8).png');
+            background-size: 100%;
+          }
           span{
             margin-left: 6px;
             color: #8590A6;
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index 9391f64e..a47ff5d9 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -10,7 +10,8 @@
         <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
-         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
+         <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
+         <div class="is_comment"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
       </div>
@@ -23,14 +24,16 @@
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
+           <div class="is_comment"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
       </div>
 
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
+           <div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
@@ -38,19 +41,22 @@
       <div v-if="favorites"  @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
-          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
+          <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
+           <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
         </el-tooltip>
         <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
+          <!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
+           <div class="is_share"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
+           <div class="is_view"></div>
         </el-tooltip>
         <!-- <div style="float:right;margin-left:8px"> -->
         <span  class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -713,6 +719,77 @@ export default {
     justify-content: flex-end;
     .interact-bar-btn {
       margin: 0 0 0 15px;
+      display: flex;
+      justify-content: end;
+      align-items: center;
+      &:hover{
+        .is_praise{
+          background: url('../../assets/images/case/Frame\(10\).png');
+        }
+        .is_favorite{
+          background: url('../../assets/images/case/Frame\(11\).png');
+          background-size: 100%;
+        }
+        .is_share{
+          background: url('../../assets/images/case/Frame\(14\).png');
+          background-size: 100%;
+        }
+        .is_view{
+          background: url('../../assets/images/case/Frame\(12\).png');
+        background-size: 100%;
+        }
+        .is_comment{
+          background: url('../../assets/images/case/Frame\(9\).png');
+          background-size: 100%;
+        }
+      }
+      .is_comment{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame.png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_view{
+        width: 17px;
+        height: 17px;
+        background: url('../../assets/images/case/Frame\(5\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_share{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(7\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_praise{
+        width: 14px;
+        height: 14px;
+        background: url('../../assets/images/case/Frame\(1\).png');
+        margin-right: 4px;
+      }
+      .is_praise_a{
+        width: 14px;
+        height: 14px;
+        background: url('../../assets/images/case/Frame\(10\).png');
+        margin-right: 4px;
+      }
+      .is_favorite{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(2\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_favorite_a{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(11\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
     }
     .interact-bar-value{
       //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index 96cf5cfa..5b05e653 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -137,20 +137,20 @@
         <div class="card_item">
           <div class="card_title">
             <i class="icon"></i>
-            <i class="text">年度</i>
+            <span class="text">年度</span>
           </div>
           <el-input style="width:190px" disabled v-model="bestYear" placeholder="请输入年度"></el-input>
         </div>
         <div class="card_item">
           <div class="card_title">
             <i class="icon"></i>
-            <i class="text">组织领域</i>
+            <span class="text">组织领域</span>
           </div>
           <el-input disabled v-model="bestOrg" placeholder="请输入组织领域"></el-input>
         </div>
         <div class="card_item">
           <div class="card_title">
-            <i class="text">最佳理由</i>
+            <span class="text">最佳理由</span>
           </div>
           <el-input type="textarea"
             placeholder="请输入内容"
@@ -172,7 +172,8 @@
         <el-table :data="tableData" border stripe>
           <el-table-column
             type="index"
-            width="50">
+            width="50"
+            label="排序">
           </el-table-column>
           <el-table-column label="案例标题" prop="caseTitle"></el-table-column>
           <el-table-column label="作者名称" prop="caseAuthor"></el-table-column>
@@ -200,6 +201,7 @@
 <script>
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js'
+import apiType from "@/api/modules/type.js";
 export default {
   name: 'articleItems',
   data() {
@@ -255,9 +257,9 @@ export default {
   mounted() {
     this.getData();
     this.getList();
-    apiCase.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
+    apiType.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
       if(res.code == 200){
-        this.adminList = res.result;
+        this.adminList = res.data.records;
       }
     })
   },
@@ -368,7 +370,7 @@ export default {
           }else{
             this.$message({
               type: 'error',
-              message: '设置最佳案例失败!'
+              message: res.message
             });
           }
           this.notBest()
@@ -583,6 +585,7 @@ export default {
       this.bestValue = true
       this.bestId = item.id
       this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
+      console.log(item.orgDomainParent,'item.orgDomainParent')
       this.bestYear = item.sysCreateTime.split('-')[0]
     },
     //添加推荐
@@ -711,7 +714,7 @@ export default {
   padding-right: 20px;
 }
 ::v-deep .el-dialog__header{
-  border-bottom: 1px solid #909399;
+  border-bottom: 1px solid #f0f0f1;
 }
 ::v-deep .el-textarea__inner{
   height: 100px !important;
diff --git a/src/views/portal/case/Excellent.vue b/src/views/portal/case/Excellent.vue
index f9aaebf1..8bb79452 100644
--- a/src/views/portal/case/Excellent.vue
+++ b/src/views/portal/case/Excellent.vue
@@ -190,9 +190,6 @@ import apiPlace from "@/api/phase2/place.js"
       this.majorValue = this.$route.query.majorName
       this.monthValue = this.$route.query.riseRankTime.split('-')[1] + '月'
       this.getCaseData()
-      apiCase.majorTypes().then(res=>{
-        this.speciData = res.result;
-      })
       Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
         if (rs[0].code == 200) {
           const {records} = rs[0].data
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index b8470d40..a7d900da 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -182,7 +182,7 @@
               </div>
             </div>
           </div>
-          <div class="back_num">
+          <div class="back_num" v-if="numIsFalse">
             <div class="search_div_num">
               当前已检索 <span style="color:#FF4040 ;">
                 {{ caseList.count }}</span> 条数据
@@ -197,7 +197,7 @@
                     <div class="case-info-title">
                       <div class="case-titdiv">
                         <div class="case-tittext">
-                          <span class="title-line-ellipsis" v-html="item.title"></span>
+                          <span :style="{maxWidth:item.excellentTag&&item.viewRankTags.length != 0?'400px':item.viewRankTags.length != 0?'500px':''}" class="title-line-ellipsis" v-html="item.title"></span>
                         </div>
                         <div class="case-activeText">
                           <!-- <span v-if="item.breCommend" class="comWords"
@@ -239,11 +239,11 @@
                       <div style="color:#2974D6;font-weight: 450;" v-for="(item, idx) in item.majorType" :key="idx">
                         {{ majorTypeTranslate(item) }}
                       </div>
-                      <div v-if="item.keyword1">{{ item.keyword1 }}</div>
-                      <div v-if="item.keyword2">{{ item.keyword2 }}</div>
-                      <div v-if="item.keyword3">{{ item.keyword3 }}</div>
-                      <div v-if="item.keyword4">{{ item.keyword4 }}</div>
-                      <div v-if="item.keyword5">{{ item.keyword5 }}</div>
+                      <div v-if="item.keyword1 && item.keyword1 != 'null'">{{ item.keyword1 }}</div>
+                      <div v-if="item.keyword2 && item.keyword2 != 'null'">{{ item.keyword2 }}</div>
+                      <div v-if="item.keyword3 && item.keyword3 != 'null'">{{ item.keyword3 }}</div>
+                      <div v-if="item.keyword4 && item.keyword4 != 'null'">{{ item.keyword4 }}</div>
+                      <div v-if="item.keyword5 && item.keyword5 != 'null'">{{ item.keyword5 }}</div>
                     </div>
                   </div>
                   <!-- </router-link> -->
@@ -481,13 +481,14 @@ export default {
   },
   data() {
     return {
+      numIsFalse: true,
       switch: {
         'total': '总',
         'quarter': '季度',
       },
       favorableName: '季度',
       popularityName: '季度',
-      pubTimeNum: 0,
+      pubTimeNum: 1,
       pageViewNum: 0,
       twoId:'',
       treeList:[],
@@ -1247,18 +1248,27 @@ export default {
       this.search(true);
     },
     searchexcellent(num) {
-      if(this.queryCondition.type==num){
-        this.queryCondition.excellent =false;
-        this.queryCondition.type = '';
-        this.search(true)
-        return
-      }
+      this.pubTimeNum = 0
+      this.pageViewNum = 0
+      this.queryCondition.orderField = ''
+      this.queryCondition.orderAsc = ''
+      // if(this.queryCondition.type==num){
+      //   this.queryCondition.excellent =false;
+      //   this.queryCondition.type = '';
+      //   this.search(true)
+      //   return
+      // }
       this.queryCondition.excellent =false;
       this.queryCondition.type = num;
       if(num == 'excellent'){
         this.queryCondition.excellent =true;
         this.queryCondition.type = num;
       }
+      if(num == 'all'){
+        this.pubTimeNum = 1
+        this.queryCondition.orderField = 'sysCreateTime'
+        this.queryCondition.orderAsc = false
+      }
       this.search(true);
       // this.getCaseData();
     },
@@ -1418,6 +1428,7 @@ export default {
       this.moreState = 2;
       // this.queryCondition.pubTimeNum = this.pubTimeNum
       // this.queryCondition.pageViewNum = this.pageViewNum
+      this.numIsFalse = true
       if(this.queryCondition.type == 'collect'){
         const params = {
           pageIndex:this.queryCondition.pageIndex,
@@ -1446,6 +1457,9 @@ export default {
               // 给所有的赋值
               this.caseList.count = res.result.count;
               this.caseList.showPagCount = res.result.count;
+              setTimeout(() => {
+                this.numIsFalse = false
+              }, 3000);
             }
           }
         })
@@ -1479,6 +1493,9 @@ export default {
               // 给所有的赋值
               this.caseList.count = res.result.count;
               this.caseList.showPagCount = res.result.count;
+              setTimeout(() => {
+                this.numIsFalse = false
+              }, 3000);
             }
           }
         })
@@ -1513,6 +1530,9 @@ export default {
           // 给所有的赋值
           this.caseList.count = res.result.count;
           this.caseList.showPagCount = res.result.count;
+          setTimeout(() => {
+            this.numIsFalse = false
+          }, 3000);
         } else {
           this.$message.error(res.message);
         }
@@ -2382,9 +2402,13 @@ export default {
       border-radius: 4px;
       // background: #04243C;
       &:hover{
-        background: #387DF7;
+        // background: #387DF7;
+        border: 1px solid #387DF7;
         .text{
-          color: #fff;
+          // color: #fff;
+        }
+        .png{
+          background: url('../../../assets/images/case/Frame(17).png') no-repeat;
         }
       }
       .png{
@@ -2423,7 +2447,7 @@ export default {
       .png{
         width: 20px;
         height: 20px;
-        background: url('../../../../public/images/browse.png') no-repeat;
+        background: url('../../../assets/images/case/Frame(17).png') no-repeat;
         background-size: 100%;
         margin-right: 9px;
       }
@@ -2443,9 +2467,13 @@ export default {
       border-radius: 4px;
       // background: #04243C;
       &:hover{
-        background: #387DF7;
+        // background: #387DF7;
+        border: 1px solid #387DF7;
         .text{
-          color: #fff;
+          // color: #fff;
+        }
+        .png{
+          background: url('../../../assets/images/case/Frame(4).png') no-repeat;
         }
       }
       .png{
@@ -2484,7 +2512,7 @@ export default {
       .png{
         width: 18px;
         height: 18px;
-        background: url('../../../../public/images/collect.png') no-repeat;
+        background: url('../../../assets/images/case/Frame(4).png') no-repeat;
         background-size: 100%;
         margin-right: 9px;
       }

From f39a1417b604508aea17e5b3b853fa13a2325ac7 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 11 Sep 2024 16:07:27 +0800
Subject: [PATCH 04/12] =?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/api/modules/cases.js             |   5 +-
 src/components/HomePage/caseList.vue |  21 ++-
 src/views/case/ManageList.vue        |  29 ++--
 src/views/portal/case/Charts.vue     |   8 +-
 src/views/portal/case/Excellent.vue  |   8 +-
 src/views/portal/case/Index.vue      | 192 ++++++++++++++++++++-------
 6 files changed, 191 insertions(+), 72 deletions(-)

diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index 46ad3d60..2bb8c58e 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -208,12 +208,15 @@ const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${d
 //收藏案例
 const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
 //浏览记录
-const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}`)
+const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}&eventKey=${data.eventKey}`)
 //浏览量TOP榜单
 const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
+//浏览记录新
+const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
 export default {
   getQueryRecommendRank,
   queryPopularityOfMajor,
+  browsingHistory,
   queryViewRecord,
   queryFavoriteCaseOfIndex,
   riseIntoRank,
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue
index b3f40ec6..b05bb23c 100644
--- a/src/components/HomePage/caseList.vue
+++ b/src/components/HomePage/caseList.vue
@@ -8,7 +8,10 @@
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
                       <span v-if="item.hidden">已隐藏</span>
-                      <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                      <span class="span_hidden" v-else  @click="emitHide(item.id)">  
+                        <!-- <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon> -->
+                         <div class="is_hidden"></div>
+                        隐藏 </span>
                     </span>
                   </p>
                   <div class="case-info-cont">
@@ -136,6 +139,22 @@
   </script>
 
   <style lang="scss" scoped>
+  .span_hidden{
+    display: flex;
+    &:hover{
+      .is_hidden{
+        background: url('../../assets/images/case/Frame(12).png');
+        background-size: 100%;
+      }
+    }
+    .is_hidden{
+      width: 18px;
+      height: 18px;
+      background: url('../../assets/images/case/Frame(5).png');
+      background-size: 100%;
+      margin-right: 10px;
+    }
+  }
     .sign-text{
       color: #666666;
       font-size: 14px;
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index 5b05e653..906a3e9f 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -52,7 +52,7 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
-            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''" @click="suggest(scope.row)" icon="el-icon-delete">榜单推荐</el-button>
+            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
             <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
               @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>
@@ -167,7 +167,7 @@
     <el-drawer
       title="推荐榜单"
       :visible.sync="RankingShow"
-      size="70%">
+      size="80%">
       <div style="padding: 10px 20px 80px">
         <el-table :data="tableData" border stripe>
           <el-table-column
@@ -175,16 +175,16 @@
             width="50"
             label="排序">
           </el-table-column>
-          <el-table-column label="案例标题" prop="caseTitle"></el-table-column>
-          <el-table-column label="作者名称" prop="caseAuthor"></el-table-column>
-          <el-table-column label="上榜人" prop="caseAuthor"></el-table-column>
-          <el-table-column label="上榜时间" prop="recommendRankPusTime"></el-table-column>
+          <el-table-column show-overflow-tooltip label="案例标题" prop="caseTitle"></el-table-column>
+          <el-table-column width="150px" label="作者名称" prop="caseAuthor"></el-table-column>
+          <el-table-column width="150px" label="上榜人" prop="caseAuthor"></el-table-column>
+          <el-table-column width="250px" label="上榜时间" prop="recommendRankPusTime"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button-group>
-                <el-button style="margin:0 5px" type="text" @click="handleNotRank(scope.row)" icon="el-icon-top">取消推荐</el-button>
-                <el-button style="margin:0 5px" type="text" @click="moveUp(scope.row,scope.$index)" icon="el-icon-delete">上移排序</el-button>
-                <el-button style="margin:0 5px" type="text" @click="moveDown(scope.row,scope.$index)" icon="el-icon-delete">下移排序</el-button>
+                <el-button style="margin:0 5px" type="text" @click="handleNotRank(scope.row)" icon="el-icon-delete">取消推荐</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveUp(scope.row,scope.$index)" icon="el-icon-top">上移排序</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveDown(scope.row,scope.$index)" icon="el-icon-bottom">下移排序</el-button>
               </el-button-group>
             </template>
           </el-table-column>
@@ -285,6 +285,10 @@ export default {
       return name;
     },
     suggest(record){
+      if(this.tableData.length == 10){
+        this.$message.error('最多推荐10个')
+        return
+      }
       this.$confirm('你确认要推荐此案例么?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -292,11 +296,10 @@ export default {
       }).then(() => {
         apiCase.riseIntoRank({caseId:record.id}).then(res=>{
           if(res.status == 200 ){
-            this.$message.success('成功')
+            this.$message.success('推荐成功')
             this.getData()
+            this.getList()
           }
-        }).catch(()=>{
-          this.$message.error('失败')
         })
       })
     },
@@ -338,7 +341,7 @@ export default {
       arr.splice(index2, 0, temp);
     },
     getList(){
-      apiCase.getQueryRecommendRank({pageSize:3}).then(res=>{
+      apiCase.getQueryRecommendRank({pageSize:10}).then(res=>{
         console.log(res,'res')
         if(res.status == 200){
           this.tableData = res.result
diff --git a/src/views/portal/case/Charts.vue b/src/views/portal/case/Charts.vue
index 49c59005..f181e658 100644
--- a/src/views/portal/case/Charts.vue
+++ b/src/views/portal/case/Charts.vue
@@ -7,8 +7,8 @@
       </div>
     </div>
     <div class="charts_content">
-      <div class="charts_item">
-          <div class="charts_item_box charts_bg1">
+      <div class="charts_item" :style="{justifyContent:recommendRank.length>0?'':'center'}">
+          <div :style="{width:recommendRank.length>0?'':'600px',marginRight:recommendRank.length>0?'':'45px'}" class="charts_item_box charts_bg1">
             <div class="charts_text">
               <div class="text">好评榜</div>
               <el-dropdown trigger="click"  @command="positiveReview">
@@ -32,7 +32,7 @@
               </li>
             </ul>
           </div>
-          <div class="charts_item_box charts_bg2">
+          <div :style="{width:recommendRank.length>0?'':'600px'}" class="charts_item_box charts_bg2">
             <div class="charts_text">
               <div class="text">人气榜</div>
               <el-dropdown trigger="click"  @command="popularityReview">
@@ -56,7 +56,7 @@
               </li>
             </ul>
           </div>
-          <div class="charts_item_box charts_bg3">
+          <div v-if="recommendRank.length > 0" class="charts_item_box charts_bg3">
             <div class="charts_text">
               <div class="text">推荐榜</div>
             </div>
diff --git a/src/views/portal/case/Excellent.vue b/src/views/portal/case/Excellent.vue
index 8bb79452..32aa6ce8 100644
--- a/src/views/portal/case/Excellent.vue
+++ b/src/views/portal/case/Excellent.vue
@@ -188,7 +188,7 @@ import apiPlace from "@/api/phase2/place.js"
     },
     mounted() {
       this.majorValue = this.$route.query.majorName
-      this.monthValue = this.$route.query.riseRankTime.split('-')[1] + '月'
+      this.monthValue = parseInt(this.$route.query.riseRankTime.split('-')[1], 10) + '月'
       this.getCaseData()
       Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
         if (rs[0].code == 200) {
@@ -275,7 +275,6 @@ import apiPlace from "@/api/phase2/place.js"
           list.push(one);
         }
       })
-      console.log(list,'计算属性');
 
       return list;
     },
@@ -331,7 +330,7 @@ import apiPlace from "@/api/phase2/place.js"
             this.treeList = result
           }
         } catch (error) {
-          console.log(error);
+          // console.log(error);
         }
       },
       goCase() {
@@ -434,7 +433,6 @@ import apiPlace from "@/api/phase2/place.js"
                 };
               });
             }
-            console.log(res?.result,'有没有数据');
             this.caseList.list = res.result
             if(this.caseList.length == 0){
               this.isSeach = true
@@ -449,7 +447,7 @@ import apiPlace from "@/api/phase2/place.js"
             this.$message.error(res.message);
           }
         }).catch(err => {
-          console.log(err);
+          // console.log(err);
         });
       },
     },
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index a7d900da..1e488c4b 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -153,21 +153,21 @@
             <div style="flex: 1; display: flex; justify-content: flex-end;align-items: center;">
               <!-- <div style="margin-right: 20px;color: #6E7B84;font-size: 14px;">当前已检索 <span style="color:#387DF7;">
                   {{ caseList.count }}</span> 条数据</div> -->
-              <div class="pub_time" @click="searchTime">
+              <div v-if="caseTimeShow" class="pub_time" @click="searchTime">
                 <div class="text">发布时间</div>
                 <div class="triangle">
                   <div :style="{borderBottomColor:pubTimeNum===2?'#387DF7':'#DCDFE6'}" class="up-triangle"></div>
                   <div :style="{borderTopColor:pubTimeNum===1?'#387DF7':'#DCDFE6'}" class="down-triangle"></div>
                 </div>
               </div>
-              <div class="pub_time" @click="searchPageView">
+              <div v-if="caseTimeShow" class="pub_time" @click="searchPageView">
                 <div class="text">浏览量</div>
                 <div class="triangle">
                   <div :style="{borderBottomColor:pageViewNum===2?'#387DF7':'#DCDFE6'}" class="up-triangle"></div>
                   <div :style="{borderTopColor:pageViewNum===1?'#387DF7':'#DCDFE6'}" class="down-triangle"></div>
                 </div>
               </div>
-              <el-select v-model="years" multiple collapse-tags
+              <el-select v-if="caseTimeShow" @change="yearsChange" v-model="years" multiple collapse-tags
                 style=" width: 147px; border-radius:20px !important;" placeholder="全部年份">
                 <el-option v-for="item in caseYears" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
@@ -189,15 +189,19 @@
             </div>
           </div>
           <div class="data-content">
-            <div v-for="item in caseList.list" :key="item.id" class="case-list">
+            <div v-for="item in caseList.list" :key="isTimeData?item.browsingHistoryId : item.id" class="case-list">
               <div class="case-info">
                 <div class="case-info-cont">
                   <!-- <router-link :to="'/case/detail?id=' + item.id"> -->
                   <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
+                    <div v-if="isTime" class="case_text">
+                      <span style="margin-right:28px">阅读了案例</span>
+                      <span>{{ item.eventTime }}</span>
+                    </div>
                     <div class="case-info-title">
                       <div class="case-titdiv">
                         <div class="case-tittext">
-                          <span :style="{maxWidth:item.excellentTag&&item.viewRankTags.length != 0?'400px':item.viewRankTags.length != 0?'500px':''}" class="title-line-ellipsis" v-html="item.title"></span>
+                          <span :style="{maxWidth:item.excellentTag&&item.viewRankTags.length != 0?'400px':item.viewRankTags.length != 0?'500px':''}" class="title-line-ellipsis" :title="item.title">{{ item.title || item.contentInfo }}</span>
                         </div>
                         <div class="case-activeText">
                           <!-- <span v-if="item.breCommend" class="comWords"
@@ -212,13 +216,15 @@
                         </div>
                         <div class="case-info-date portal-time">
                           <i class="el-icon-time"></i>
-                          <time-show :time="item.sysCreateTime"></time-show>
+                          <time-show v-if="item.id" :time="item.sysCreateTime"></time-show>
+                          <span v-else>该案例已被删除</span>
                         </div>
                       </div>
                     </div>
                   </div>
                   <!-- </router-link> -->
-                  <div style="height:58px;padding-top:14px ">
+                  <div v-if="!item.id" style="height:25px;padding-top:14px "></div>
+                  <div v-if="item.id" style="height:58px;padding-top:14px ">
                     <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"
                       :sex="item.authorInfo.sex" :authorTags="item.authorTags" :aid="item.authorInfo.aid">
                       <template>
@@ -230,7 +236,7 @@
                     </author>
                   </div>
                   <!-- <router-link :to="'/case/detail?id=' + item.id"> -->
-                  <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
+                  <div v-if="item.id" @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
                     <div class="keyword-text clearfix">
                       <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomainParent">
                         {{ orgDomainTranslate(item.orgDomainParent) }}
@@ -247,7 +253,7 @@
                     </div>
                   </div>
                   <!-- </router-link> -->
-                  <div class="case-info-summary two-line-ellipsis" @click="toCaseDetail(item.id, item.refId)">
+                  <div v-if="item.id" class="case-info-summary two-line-ellipsis" @click="toCaseDetail(item.id, item.refId)">
                     {{ item.summary }}
                     <!-- <router-link :to="'/case/detail?id='+item.id"> -->
                     <!-- {{displayAll(item)}} -->
@@ -256,7 +262,7 @@
                     <!-- {{item.isAll?'收起':'展开'}} -->
                     <!-- </span> -->
                   </div>
-                  <div style="display: flex;justify-content: flex-end;">
+                  <div v-if="item.id" style="display: flex;justify-content: flex-end;">
                     <div style="margin:8px 0;">
                       <interactBar :type="3" :data="item" :comments="false" :shares="true"></interactBar>
                     </div>
@@ -365,7 +371,7 @@
               </li>
             </ul>
           </div>
-          <div class="portal-ranking ranking-bg2" style="margin-top:26px">
+          <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="margin-top:26px">
             <p class="ranking-title">推荐榜</p>
             <ul class="ranking-data">
               <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
@@ -477,10 +483,14 @@ export default {
     portalFloatTools,
     interactBar,
     timeShow,
-    author
+    author,
   },
   data() {
     return {
+      isTimeData: false,
+      articlePageList: [],
+      caseTimeShow: true,
+      isTime: false,
       numIsFalse: true,
       switch: {
         'total': '总',
@@ -561,9 +571,9 @@ export default {
     };
   },
   watch: {
-    years() {
-      this.search(true)
-    }
+    // years() {
+    //   this.search(true)
+    // }
   },
   computed: {
     ...mapGetters(["userInfo", "portalCase"]),
@@ -634,7 +644,7 @@ export default {
           list.push(one);
         }
       })
-      console.log(list,'计算属性');
+      // console.log(list,'计算属性');
 
       return list;
     },
@@ -653,7 +663,7 @@ export default {
   },
   beforeRouteLeave (to, from, next) {
     if(to.name !== 'caseDetail'){
-      console.log('我是外')
+      // console.log('我是外')
       this.queryCondition.pageIndex = 1
       this.search()
       // window.location.reload()
@@ -665,7 +675,7 @@ export default {
   },
   beforeRouteEnter(to, from, next) {
     if(from.name !== 'caseDetail'){
-      console.log('我是内')
+      // console.log('我是内')
     }
     next(vm=>{
       vm.$nextTick(() => {
@@ -756,10 +766,10 @@ export default {
       history.pushState(null, null, document.URL); //这里有没有都无所谓，最好是有以防万一
       isBack = true;
     }
-    console.log(isBack, 'isBack');
+    // console.log(isBack, 'isBack');
     // Promise.all([apiType.items("org_domain"), apiCase.majorTypes()]).then(rs => {
       // 90是测试环境，155是生产环境
-      console.log(this.caseType);
+      // console.log(this.caseType);
 
     Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
       if (rs[0].code == 200) {
@@ -824,7 +834,7 @@ export default {
   },
   beforeDestroy() {
     // window.removeEventListener("scroll", this.handleScroll);
-    console.log('销毁了');
+    // console.log('销毁了');/
 
   },
   methods: {
@@ -837,7 +847,7 @@ export default {
       this.getPopularity()
     },
     handleType(msg){
-      this.queryCondition.type = msg
+      // this.queryCondition.type = msg
     },
     handleOptionClick(treeItem){
       this.treeList.forEach(one => {
@@ -897,14 +907,14 @@ export default {
           this.treeList = result
         }
       } catch (error) {
-        console.log(error);
+        // console.log(error);
       }
     },
     getYears() {
       apiCase.caseYears().then(res => {
         if (res.status == 200) {
           const { result } = res;
-          console.log(result);
+          // console.log(result);
           this.caseYears = result.map(year => ({
             value: year,
             label: year,
@@ -914,6 +924,10 @@ export default {
     },
     // 查看率的时间
     toCaseDetail(id, refId) {
+      if(!id){
+        this.$message.error('该案例已被删除')
+        return
+      }
       if (refId) {
         apiCase.startReadTimer(refId)
       }
@@ -983,7 +997,7 @@ export default {
     },
     // 组织领域全部
     domainall(type) {
-      console.log(this.selectList, 999);
+      // console.log(this.selectList, 999);
       if (type == 1) {
         // 清空一下所有的
         this.domain.forEach(item => {
@@ -1247,7 +1261,13 @@ export default {
       this.queryCondition.orderAsc = this.pageViewNum == 2 ? true : this.pageViewNum == 1 ? false : ''
       this.search(true);
     },
+    yearsChange(e){
+      this.search(true)
+    },
     searchexcellent(num) {
+      this.isTimeData = false
+      this.isTime = false
+      this.caseTimeShow = true
       this.pubTimeNum = 0
       this.pageViewNum = 0
       this.queryCondition.orderField = ''
@@ -1260,15 +1280,24 @@ export default {
       // }
       this.queryCondition.excellent =false;
       this.queryCondition.type = num;
+      this.years = []
       if(num == 'excellent'){
         this.queryCondition.excellent =true;
         this.queryCondition.type = num;
       }
-      if(num == 'all'){
+      if(num == 'all' || num == 'recommend'){
         this.pubTimeNum = 1
         this.queryCondition.orderField = 'sysCreateTime'
         this.queryCondition.orderAsc = false
       }
+      if(num == 'time'){
+        this.isTime = true
+        this.caseTimeShow = false
+        this.isTimeData = true
+      }
+      if(num == 'collect'){
+        this.caseTimeShow = false
+      }
       this.search(true);
       // this.getCaseData();
     },
@@ -1398,7 +1427,7 @@ export default {
           children: item.list || []
         }
       })
-      console.log(JSON.stringify(this.queryCondition.orgDomainDtos));
+      // console.log(JSON.stringify(this.queryCondition.orgDomainDtos));
 
 
 
@@ -1432,7 +1461,7 @@ export default {
       if(this.queryCondition.type == 'collect'){
         const params = {
           pageIndex:this.queryCondition.pageIndex,
-          pageSize:10,
+          pageSize:5,
           orderField:this.queryCondition.orderField,
           orderAsc:this.queryCondition.orderAsc
         }
@@ -1452,7 +1481,6 @@ export default {
                 };
               });
               this.caseList.list = res.result.list
-              console.log(res.result.list ,'有没有1111数据')
               this.getCaseUserData(res.result.list);
               // 给所有的赋值
               this.caseList.count = res.result.count;
@@ -1466,14 +1494,30 @@ export default {
         return
       }
       if(this.queryCondition.type=='time'){
-        const data = {
+        // const data = {
+        //   pageIndex: this.queryCondition.pageIndex,
+        //   pageSize: 5,
+        //   contentType: 3,
+        //   aid: this.userInfo.aid||'965342027497607168',
+        //   hidden: '',
+        //   eventKey: 'readCase'
+        // }
+        // await apiCase.queryViewRecord(data).then(res=>{
+        //   if(res.status == 200){
+        //     if(res.result.list.length > 0){
+        //       let ids = res.result.list.map(item=>item.contentId);
+        //       const noReapetIds = [...new Set(ids)];
+        //       this.articlePageList = res.result.list;
+        //       this.getCase(noReapetIds,res.result.list)
+        //       this.caseList.count = res.result.count;
+        //       this.caseList.showPagCount = res.result.count;
+        //     }
+        //   }
+        // })
+        const params = {
           pageIndex: this.queryCondition.pageIndex,
-          pageSize: 10,
-          contentType: 3,
-          aid: this.userInfo.aid || '965628977500655616',
-          hidden: '',
         }
-        await apiCase.queryViewRecord(data).then(res=>{
+        await apiCase.browsingHistory(params).then(res=>{
           if(res.status == 200){
             if(res.result.list.length > 0){
               this.isSeach = false;
@@ -1490,7 +1534,6 @@ export default {
               });
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
-              // 给所有的赋值
               this.caseList.count = res.result.count;
               this.caseList.showPagCount = res.result.count;
               setTimeout(() => {
@@ -1524,7 +1567,7 @@ export default {
           } else {
             this.moreState = 3;
           }
-          console.log(res?.result?.list ,'有没有数据');
+          // console.log(res?.result?.list ,'有没有数据');
           this.caseList.list = res.result.list
           this.getCaseUserData(res.result.list);
           // 给所有的赋值
@@ -1537,7 +1580,10 @@ export default {
           this.$message.error(res.message);
         }
       }).catch(err => {
-        console.log(err);
+        // console.log(err);
+        setTimeout(() => {
+          this.numIsFalse = false
+        }, 3000);
       });
 
       // await apiCase.queryList(this.queryCondition).then(res => {
@@ -1573,6 +1619,50 @@ export default {
       //     console.log(err);
       //   });
     },
+    getCase(ids,list){
+      console.log(ids,list,'xixixi')
+      apiCase.ids(ids).then(res=>{
+        console.log(res,'ressss')
+        return
+          if(res.status == 200) {
+            this.isSeach = false;
+            const listData = []
+            list.forEach((item, index) => {
+              res.result.some(con => {
+              if (con.id == item.contentId) {
+                  item.info = con;
+                  con.eventTime = item.eventTime
+                  listData.push(con)
+                  if(typeof item.info.majorType == 'string') {
+                      item.info.majorType = item.info.majorType.split(',');
+                  }
+                  return true;
+              } else {
+                  return false;
+              }
+              });
+            });
+            listData.forEach(item=>{
+              item.info = {};
+              item.deleted=false;
+              item.authorInfo = {
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+              }
+              item.isAll = false;
+            })
+            setTimeout(() => {
+              this.numIsFalse = false
+            }, 3000);
+            this.getCaseUserData(listData);
+            this.caseList.list = listData
+            console.log(listData,'this.caseList.list')
+          }
+      })
+  },
     // getTags() {
     //   this.searchTags = [];
     //   let caseData = deepClone(this.queryCondition);
@@ -1760,7 +1850,7 @@ export default {
     margin-bottom: 10px;
     font-size: 18px;
     max-width: 400px;
-    min-width: 300px;
+    min-width: 260px;
     height: 67px;
     background: #DDEDFF;
     border-radius: 8px;
@@ -2184,7 +2274,7 @@ export default {
       font-size: 12px;
       border-radius: 2px;
       padding: 2px 4px;
-      margin-left: 20px;
+      margin-left: 15px;
     }
 
   }
@@ -2407,9 +2497,9 @@ export default {
         .text{
           // color: #fff;
         }
-        .png{
-          background: url('../../../assets/images/case/Frame(17).png') no-repeat;
-        }
+        // .png{
+        //   background: url('../../../assets/images/case/Frame(17).png') no-repeat;
+        // }
       }
       .png{
         width: 18px;
@@ -2447,7 +2537,7 @@ export default {
       .png{
         width: 20px;
         height: 20px;
-        background: url('../../../assets/images/case/Frame(17).png') no-repeat;
+        background: url('../../../../public/images/browse.png') no-repeat;
         background-size: 100%;
         margin-right: 9px;
       }
@@ -2472,9 +2562,9 @@ export default {
         .text{
           // color: #fff;
         }
-        .png{
-          background: url('../../../assets/images/case/Frame(4).png') no-repeat;
-        }
+        // .png{
+        //   background: url('../../../assets/images/case/Frame(4).png') no-repeat;
+        // }
       }
       .png{
         width: 18px;
@@ -2512,7 +2602,7 @@ export default {
       .png{
         width: 18px;
         height: 18px;
-        background: url('../../../assets/images/case/Frame(4).png') no-repeat;
+        background: url('../../../../public/images/collect.png') no-repeat;
         background-size: 100%;
         margin-right: 9px;
       }
@@ -2573,6 +2663,12 @@ export default {
 
     .case-info {
       .case-info-cont {
+        .case_text{
+            font-size: 14px;
+            font-weight: 400;
+            color: #666666;
+            margin-bottom: 8px;
+          }
         .case-info-title {
           font-size: 15px;
           color: #333;

From 5d6b2b6532fa745b9b7526112eefd76848bc1961 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 11 Sep 2024 17:53:34 +0800
Subject: [PATCH 05/12] =?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/assets/images/case/wight.png      | Bin 0 -> 425 bytes
 src/assets/images/case/wighttime.png  | Bin 0 -> 398 bytes
 src/components/Case/collectList.vue   |  25 ++++++++++++++++++++++++-
 src/components/Portal/interactBar.vue |   1 +
 src/views/portal/case/Index.vue       |  13 ++++++++-----
 5 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/images/case/wight.png
 create mode 100644 src/assets/images/case/wighttime.png

diff --git a/src/assets/images/case/wight.png b/src/assets/images/case/wight.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cac95308d379f920a72d21e8aa8256cbdcdd72f
GIT binary patch
literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$V@X6oR5(wSl)o!QVHn3h-!d2|<qie|F|gf#Kvtuoqznvl$2%Ix9f(afBSjH^
z1f{G@6ml13G$;o3IM3}pIvw|%_ujWo=kz|$^Lf6{kB*2OGus6!l2*%HRc17^A>bA0
z0VX9q7x~9P`#?PeA4yv28kAAf8-jnzR23>RGgngsu7H`Csusx1D!@1}7T*3n4;&^c
z&Vk#ED!+RS&x@p{+hk@>Avjz9C*X~BB_23iG8Ff{bI=@c7AE8VQ<84XY#5kMlAOd=
zB(XQr(z393U;s#)9OG<A+WBjC8)Y$o+v}1JT0P2o2iRpN1YlXxaq9bT{ATvmL0QcN
zGMY`8S2O`UbfCzWvtQD8TSZ-#R+V&L1lsaZ<`ns6`xL9W`z1-IMWBnY(QbD@L(+BF
z{)MD>d%#Et-j=jk1oHlT0P86rH&x%QHMe^rNsC3GK1sgvrN_)1IGFtG-crY3FhF}x
Tf~UI~00000NkvXXu0mjftQWK`

literal 0
HcmV?d00001

diff --git a/src/assets/images/case/wighttime.png b/src/assets/images/case/wighttime.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c4cc3d77e7d67eb4b19d9c3683e12ce1ca0168e
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$NJ&INR5(wilrc&~F%X8o0SgNY4`5*-Xz7B5g1v$k3KlEacmoR$VQJw31Q)ch
zuuxEJECd%6+)^vI@CX)y3*(zdM&j;E-V;+!X1@G0$seI&sp<-_11tkmA>|#o2hK#~
zYPd||fU3>{$G~FM0a2_6v_<6AV?Usv;vAT$f%x_(upuHh7AQeMiJdZD0XYE1fc=WS
z4`9KRIp`UfPbk?7@x#P^w@|ets=8KCFEj1bfvj}ZKqujbQmiJRj)C5ao0|ToqP~H?
z!Z34+2Eb9~ut5{h9k2<U+AI>V5>(fk)m{VJ8Ccm`-LPFm4pt7^d}T>ZmcwrCAw~u3
z{vaP3_{-~_fEi#i1bQOUa?l*`_y?cGert)y%dlxL5`L>{+kCe5%e0=Qs;11YIpsS~
s?E<@|WaJx(j|~26CqA~0tB7m90hvy5hdQ~SZU6uP07*qoM6N<$g58&>SpWb4

literal 0
HcmV?d00001

diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue
index d70d0b42..d6c613dd 100644
--- a/src/components/Case/collectList.vue
+++ b/src/components/Case/collectList.vue
@@ -8,7 +8,10 @@
 
           </div>
           <div class="article-info-date">
-            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
+            <div class="box">
+              <div class="image"></div>
+              <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px">取消收藏</el-button>
+            </div>
           </div>
         </div>
         <div class="article-info-tools">
@@ -161,6 +164,26 @@
         line-height: 40px;
         font-weight: 200;
         color: #999999;
+        display: flex;
+        justify-content: end;
+        .box{
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          .image{
+            width: 14px;
+            height: 14px;
+            background: url('../../assets/images/case/Frame(5).png') no-repeat;
+            background-size: 100%;
+            margin-right: 10px;
+          }
+          &:hover{
+            .image{
+              background: url('../../assets/images/case/Frame(12).png') no-repeat;
+              background-size: 100%;
+            }
+          }
+        }
         i {
           margin-right: 5px;
         }
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index a47ff5d9..a1faad95 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -536,6 +536,7 @@ export default {
             this.$store.dispatch("unicomFavorites",false)
           }
           this.$message({message:'已取消收藏',type:'success'});
+          this.$emit('deleteFavorite',true)
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
           console.log('取消收藏失败：'+res.message);
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 1e488c4b..aa1c5998 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -264,7 +264,7 @@
                   </div>
                   <div v-if="item.id" style="display: flex;justify-content: flex-end;">
                     <div style="margin:8px 0;">
-                      <interactBar :type="3" :data="item" :comments="false" :shares="true"></interactBar>
+                      <interactBar @deleteFavorite="deleteFavorite" :type="3" :data="item" :comments="false" :shares="true"></interactBar>
                     </div>
                   </div>
                 </div>
@@ -838,6 +838,9 @@ export default {
 
   },
   methods: {
+    deleteFavorite(e){
+      this.search()
+    },
     positiveReview(e){
       this.favorableName = this.switch[e]
       this.getPositive()
@@ -2498,7 +2501,7 @@ export default {
           // color: #fff;
         }
         // .png{
-        //   background: url('../../../assets/images/case/Frame(17).png') no-repeat;
+        //   background: url('../../../assets/images/case/wighttime.png') no-repeat;
         // }
       }
       .png{
@@ -2537,7 +2540,7 @@ export default {
       .png{
         width: 20px;
         height: 20px;
-        background: url('../../../../public/images/browse.png') no-repeat;
+        background: url('../../../assets/images/case/wighttime.png') no-repeat;
         background-size: 100%;
         margin-right: 9px;
       }
@@ -2563,7 +2566,7 @@ export default {
           // color: #fff;
         }
         // .png{
-        //   background: url('../../../assets/images/case/Frame(4).png') no-repeat;
+        //   background: url('../../../assets/images/case/wight.png') no-repeat;
         // }
       }
       .png{
@@ -2602,7 +2605,7 @@ export default {
       .png{
         width: 18px;
         height: 18px;
-        background: url('../../../../public/images/collect.png') no-repeat;
+        background: url('../../../assets/images/case/wight.png') no-repeat;
         background-size: 100%;
         margin-right: 9px;
       }

From af1b7040eae6c4e849796afa4cbb9f5abbb2a61c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 11 Sep 2024 20:04:12 +0800
Subject: [PATCH 06/12] =?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/Portal/authorInfo.vue |  2 +-
 src/views/case/ManageList.vue        |  6 +++++-
 src/views/portal/case/Charts.vue     |  2 +-
 src/views/portal/case/Excellent.vue  | 17 +++++++++++------
 src/views/portal/case/Index.vue      |  6 +++---
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index bb6f8001..92248e8f 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -132,7 +132,7 @@
       font-weight: 400;
       font-size: 12px;
       color: #FFFFFF;
-      padding: 3px 10px 4px 8px;
+      padding: 4px 10px;
     }
     .uavatar{
       // border: 1px solid #73adfe;
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index 906a3e9f..896297fc 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -441,6 +441,11 @@ export default {
               message: '取消成功!'
             });
             this.getData()
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.message
+            });
           }
         })
       }).catch(() => {
@@ -588,7 +593,6 @@ export default {
       this.bestValue = true
       this.bestId = item.id
       this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
-      console.log(item.orgDomainParent,'item.orgDomainParent')
       this.bestYear = item.sysCreateTime.split('-')[0]
     },
     //添加推荐
diff --git a/src/views/portal/case/Charts.vue b/src/views/portal/case/Charts.vue
index f181e658..ad18250f 100644
--- a/src/views/portal/case/Charts.vue
+++ b/src/views/portal/case/Charts.vue
@@ -103,7 +103,7 @@ import portalHeader from '@/components/PortalHeader.vue'
     },
     methods: {
       getPopularity() {
-        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 1 : 2).then(res => {
+        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 3 : 4).then(res => {
           if(res.status == 200) {
             this.Popularity = res.result
           }
diff --git a/src/views/portal/case/Excellent.vue b/src/views/portal/case/Excellent.vue
index 32aa6ce8..e2bb980b 100644
--- a/src/views/portal/case/Excellent.vue
+++ b/src/views/portal/case/Excellent.vue
@@ -44,12 +44,17 @@
                     <div class="case-tittext">
                       <span class="title-line-ellipsis" v-html="item.title"></span>
                     </div>
-                    <!-- <div class="case-activeText" @click.stop="toExcellent(item)">
-                      <span v-if="item.breCommend" class="comWords"
+                    <div class="case-activeText" @click.stop="toExcellent(item)">
+                      <!-- <span v-if="item.breCommend" class="comWords"
                         style="background-color:rgba(232, 139, 72);">荐</span>
-                      <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span>
-                      <span class="comWords" style="background-color:orange">2024年度最佳</span>
-                    </div> -->
+                      <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
+                      <span v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
+                        {{item.excellentTag}}
+                      </span>
+                      <span v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
+                        {{tag.tagName}}
+                      </span>
+                    </div>
                     <div class="case-info-date portal-time">
                       <i class="el-icon-time"></i>
                       <time-show :time="item.sysCreateTime"></time-show>
@@ -59,7 +64,7 @@
               </div>
               <div style="height:58px;padding-top:14px ">
                 <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"
-                  :sex="item.authorInfo.sex" :aid="item.authorInfo.aid">
+                  :sex="item.authorInfo.sex" :authorTags="item.authorTags" :aid="item.authorInfo.aid">
                   <template>
                     <div v-if="item.breCommend"
                       style="padding-top: 6px;flex: 1;display: flex;justify-content: flex-end;color: #999;font-size: 12px;">
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index aa1c5998..d4087156 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -207,10 +207,10 @@
                           <!-- <span v-if="item.breCommend" class="comWords"
                             style="background-color:rgba(232, 139, 72);">荐</span>
                           <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
-                          <span v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 3px 12px 4px 9px;">
+                          <span v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
                             {{item.excellentTag}}
                           </span>
-                          <span @click.stop="toExcellent(tag)" v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 3px 12px 4px 9px;">
+                          <span @click.stop="toExcellent(tag)" v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
                             {{tag.tagName}}
                           </span>
                         </div>
@@ -1789,7 +1789,7 @@ export default {
 
       //   }
       // });
-      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 1 : 2).then(res => {
+      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 3 : 4).then(res => {
         if(res.status == 200) {
           this.Popularity = res.result
         }

From 95de64a5ee290b301cfebb37702374adb9aa4d49 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 11 Sep 2024 20:47:49 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=B0=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/authorInfo.vue |  4 ++--
 src/views/case/ManageList.vue        |  4 ++--
 src/views/portal/case/Index.vue      | 16 +++++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index 92248e8f..938b4839 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="item-author">
-		<div  @click="toHome()">
+		<div  v-if="userName" @click="toHome()">
       <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
       <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
       <el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
@@ -12,7 +12,7 @@
         </div>
         </div>
     </div>
-		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
+		<div v-if="!onlyAvatar&&userName" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
       <span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index 896297fc..ed237e54 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -289,7 +289,7 @@ export default {
         this.$message.error('最多推荐10个')
         return
       }
-      this.$confirm('你确认要推荐此案例么?', '提示', {
+      this.$confirm('你确认要推荐此案例吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -304,7 +304,7 @@ export default {
       })
     },
     handleNotRank(record){
-      this.$confirm('你确认要取消推荐么?', '提示', {
+      this.$confirm('你确认要取消推荐吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index d4087156..f0086e9f 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -487,6 +487,7 @@ export default {
   },
   data() {
     return {
+      timeoutId: null,
       isTimeData: false,
       articlePageList: [],
       caseTimeShow: true,
@@ -1301,6 +1302,10 @@ export default {
       if(num == 'collect'){
         this.caseTimeShow = false
       }
+      if (this.timeoutId) {
+        clearTimeout(this.timeoutId);
+        this.timeoutId = null;
+      }
       this.search(true);
       // this.getCaseData();
     },
@@ -1488,7 +1493,7 @@ export default {
               // 给所有的赋值
               this.caseList.count = res.result.count;
               this.caseList.showPagCount = res.result.count;
-              setTimeout(() => {
+              this.timeoutId = setTimeout(() => {
                 this.numIsFalse = false
               }, 3000);
             }
@@ -1539,7 +1544,7 @@ export default {
               this.getCaseUserData(res.result.list);
               this.caseList.count = res.result.count;
               this.caseList.showPagCount = res.result.count;
-              setTimeout(() => {
+              this.timeoutId = setTimeout(() => {
                 this.numIsFalse = false
               }, 3000);
             }
@@ -1576,7 +1581,7 @@ export default {
           // 给所有的赋值
           this.caseList.count = res.result.count;
           this.caseList.showPagCount = res.result.count;
-          setTimeout(() => {
+          this.timeoutId = setTimeout(() => {
             this.numIsFalse = false
           }, 3000);
         } else {
@@ -1584,7 +1589,7 @@ export default {
         }
       }).catch(err => {
         // console.log(err);
-        setTimeout(() => {
+        this.timeoutId = setTimeout(() => {
           this.numIsFalse = false
         }, 3000);
       });
@@ -1623,10 +1628,7 @@ export default {
       //   });
     },
     getCase(ids,list){
-      console.log(ids,list,'xixixi')
       apiCase.ids(ids).then(res=>{
-        console.log(res,'ressss')
-        return
           if(res.status == 200) {
             this.isSeach = false;
             const listData = []

From 7f581272d540234bff02b06bf5643ce123ae381a Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 12 Sep 2024 14:04:15 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/portal/case/Charts.vue b/src/views/portal/case/Charts.vue
index ad18250f..46c547e0 100644
--- a/src/views/portal/case/Charts.vue
+++ b/src/views/portal/case/Charts.vue
@@ -103,14 +103,14 @@ import portalHeader from '@/components/PortalHeader.vue'
     },
     methods: {
       getPopularity() {
-        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 3 : 4).then(res => {
+        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 1 : 2).then(res => {
           if(res.status == 200) {
             this.Popularity = res.result
           }
         })
       },
       getPositive() {
-        apiCase.queryCommentsNew(10,this.favorableName == '季度' ? 1 : 2).then(res => {
+        apiCase.queryCommentsNew(10,this.favorableName == '季度' ? 3 : 4).then(res => {
           if(res.status == 200) {
             this.Positive = res.result
           }
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index f0086e9f..83fdaefe 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -1791,7 +1791,7 @@ export default {
 
       //   }
       // });
-      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 3 : 4).then(res => {
+      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 1 : 2).then(res => {
         if(res.status == 200) {
           this.Popularity = res.result
         }
@@ -1814,7 +1814,7 @@ export default {
       //     // }
       //   }
       // });
-      apiCase.queryCommentsNew(3,this.favorableName == '季度' ? 1 : 2).then(res => {
+      apiCase.queryCommentsNew(3,this.favorableName == '季度' ? 3 : 4).then(res => {
         if(res.status == 200) {
           this.Positive = res.result
         }

From eb6c845d00a469c38a029ddb7d36225e2fd9010c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 12 Sep 2024 14:55:44 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue | 149 +++++++++++++++++++++++--------
 1 file changed, 110 insertions(+), 39 deletions(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index bf733d64..99361d83 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -112,7 +112,18 @@
           <div>
             <div id="fixd-box">
               <div class="portal-ranking ranking-bg">
-                <p class="ranking-title">好评榜</p>
+                <div style="display: flex;justify-content: space-between;">
+                  <p class="ranking-title">好评榜</p>
+                  <el-dropdown trigger="click"  @command="positiveReview">
+                    <span class="el-dropdown-link">
+                      {{favorableName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="total">总</el-dropdown-item>
+                      <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
                     style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
@@ -131,12 +142,23 @@
                     <span class="portal-right-text" v-if="index == 4">
                       <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                     </span>
-                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
                   </li>
                 </ul>
               </div>
               <div style="margin-top:26px" class="portal-ranking ranking-bg1">
-                <p class="ranking-title">人气榜</p>
+                <div style="display: flex;justify-content: space-between;">
+                  <p class="ranking-title">人气榜</p>
+                  <el-dropdown trigger="click"  @command="popularityReview">
+                    <span class="el-dropdown-link">
+                      {{popularityName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="total">总</el-dropdown-item>
+                      <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
                     style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
@@ -155,7 +177,27 @@
                     <span class="portal-right-text" v-if="index == 4">
                       <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                     </span>
-                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                  </li>
+                </ul>
+              </div>
+              <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="margin-top:26px">
+                <p class="ranking-title">推荐榜</p>
+                <ul class="ranking-data">
+                  <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
+                    style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                    <router-link :to="'/case/detail?id=' + item.caseId">
+                      <span class="portal-right-text blue-one" v-if="index == 0">
+                        <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
+                      </span>
+                      <span class="portal-right-text blue-tow" v-if="index == 1">
+                        <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
+                      </span>
+                      <span class="portal-right-text blue-three" v-if="index == 2">
+                        <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
+                      </span>
+                      <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                    </router-link>
                   </li>
                 </ul>
               </div>
@@ -199,6 +241,12 @@ export default {
   },
   data() {
     return {
+      switch: {
+        'total': '总',
+        'quarter': '季度',
+      },
+      favorableName: '季度',
+      popularityName: '季度',
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       resonimg: {},
       Internet: 3,//1是成功 2是是失败 3是检测中
@@ -210,6 +258,7 @@ export default {
       ankingList: [],
       Popularity: [],
       Positive: [],
+      recommendRank: [],
       resolveId: '',
       basePath: process.env.VUE_APP_FILE_BASE_URL,
       pdfPath: '',
@@ -271,6 +320,14 @@ export default {
     this.cumulativeDuration = 0;
   },
   methods: {
+    positiveReview(e){
+      this.favorableName = this.switch[e]
+      this.getPositive()
+    },
+    popularityReview(e){
+      this.popularityName = this.switch[e]
+      this.getPopularity()
+    },
     endTimeRequst(caseId, recordEndTime) {
       console.log(this.dataTime);
       let time = (recordEndTime - this.dataTime) / 1000 / 60
@@ -297,6 +354,7 @@ export default {
       this.getAnkingData();
       this.getPopularity();
       this.getPositive();
+      this.getQueryRecommendRank();
       this.couresreso();
       this.retest();
       window.addEventListener(
@@ -442,13 +500,13 @@ export default {
       // location.href =`${this.webBaseUrl}/case/detail?id=${item.id}`
       // this.$router.push(`/case/detail?id=${item.id}`);
       const currentRoute = this.$router.currentRoute;
-      if (currentRoute.query.id !== item.id) {
-        this.$router.push('/case/detail?id=' + item.id);
+      if (currentRoute.query.id !== item.caseId) {
+        this.$router.push('/case/detail?id=' + item.caseId);
       } else {
         // 结束时间
         let recordEndTime = new Date().getTime()
         this.endTimeRequst(item.id, recordEndTime)
-        location.href = `${this.webBaseUrl}/case/detail?id=${item.id}`
+        location.href = `${this.webBaseUrl}/case/detail?id=${item.caseId}`
       }
     },
     goTop() {
@@ -489,9 +547,9 @@ export default {
       if (pdfTopBox.getBoundingClientRect().top < 1000) {
         document.querySelector('#pdfTopBox').style.cssText = "position:static";
       }
-      if (scrollTop > 630) {
+      if (scrollTop > 800) {
         this.isTopBoxShow = true;
-        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:" + outerWidth + "px";
+        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -624px;width:" + outerWidth + "px";
       } else {
         document.querySelector('#fixd-box').style.cssText = "position: static";
       }
@@ -505,40 +563,53 @@ export default {
       })
     },
     getPopularity() {
-      apiCase.queryPraises(5).then(res => {
-        if (res.status == 200) {
-          this.Popularity = res.result;
-          if (res.result.length < 5) {
-            for (let i = 0; i = (5 - res.result.length); i++) {
-              this.Popularity.push({
-                authorName: '',
-                count: 1,
-                id: '',
-                title: '',
-              })
-            }
-          }
+      // apiCase.queryPraises(5).then(res => {
+      //   if (res.status == 200) {
+      //     this.Popularity = res.result;
+      //     if (res.result.length < 5) {
+      //       for (let i = 0; i = (5 - res.result.length); i++) {
+      //         this.Popularity.push({
+      //           authorName: '',
+      //           count: 1,
+      //           id: '',
+      //           title: '',
+      //         })
+      //       }
+      //     }
+      //   }
+      // })
+      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 1 : 2).then(res => {
+        if(res.status == 200) {
+          this.Popularity = res.result
+        }
+      })
+    },
+    getQueryRecommendRank(){
+      apiCase.queryRecommendRank(3).then(res => {
+        if(res.status == 200) {
+          this.recommendRank = res.result
         }
       })
     },
     getPositive() {
-      apiCase.queryComments(5).then(res => {
-        if (res.status == 200) {
-          this.Positive = res.result;
-          if (res.result.length < 5) {
-            for (let i = 0; i = (5 - res.result.length); i++) {
-              this.Positive.push({
-                authorName: '',
-                count: 1,
-                id: '',
-                title: '',
-              })
-            }
-
-          }
-          // console.log(this.Positive);
-
-
+      // apiCase.queryComments(5).then(res => {
+      //   if (res.status == 200) {
+      //     this.Positive = res.result;
+      //     if (res.result.length < 5) {
+      //       for (let i = 0; i = (5 - res.result.length); i++) {
+      //         this.Positive.push({
+      //           authorName: '',
+      //           count: 1,
+      //           id: '',
+      //           title: '',
+      //         })
+      //       }
+      //     }
+      //   }
+      // })
+      apiCase.queryCommentsNew(3,this.favorableName == '季度' ? 3 : 4).then(res => {
+        if(res.status == 200) {
+          this.Positive = res.result
         }
       })
     },

From 53073fd8ffed402d4b0e6ed9d82f0cfab952e81e Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 12 Sep 2024 20:12:31 +0800
Subject: [PATCH 10/12] =?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/api/modules/cases.js            |   3 +
 src/views/portal/case/Charts.vue    |   2 +-
 src/views/portal/case/Detail.vue    |  49 ++++--
 src/views/portal/case/Excellent.vue |  49 ++++--
 src/views/portal/case/Index.vue     | 248 +++++++++++++++-------------
 5 files changed, 209 insertions(+), 142 deletions(-)

diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index 2bb8c58e..c0adadcc 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -213,7 +213,10 @@ const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/l
 const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
 //浏览记录新
 const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
+//获取所有的专业月份
+const queryAllTimePopularityOfMajor = () => ajax.get('/xboe/m/boe/cases/queryAllTimePopularityOfMajor')
 export default {
+  queryAllTimePopularityOfMajor,
   getQueryRecommendRank,
   queryPopularityOfMajor,
   browsingHistory,
diff --git a/src/views/portal/case/Charts.vue b/src/views/portal/case/Charts.vue
index 46c547e0..f55d3df3 100644
--- a/src/views/portal/case/Charts.vue
+++ b/src/views/portal/case/Charts.vue
@@ -185,7 +185,7 @@ import portalHeader from '@/components/PortalHeader.vue'
         padding: 30px;
         background-color: #fff;
         width: 30%;
-        min-height: 500px;
+        min-height: 716px;
         margin-right: 30px;
         .charts_text{
           display: flex;
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 99361d83..fa7b97b3 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -109,9 +109,13 @@
           </div>
         </div>
         <div class="xcontent2-minor" :style="{ display: zoomShow ? '' : 'none' }">
-          <div>
-            <div id="fixd-box">
-              <div class="portal-ranking ranking-bg">
+          <div id="fixd-box">
+            <router-link class="the_charts" to="/case/charts">
+              <div class="text">排行榜</div>
+              <div class="icon">></div>
+            </router-link>
+            <div>
+              <div class="portal-ranking ranking-bg" style="padding: 20px 15px;max-height: 222px;">
                 <div style="display: flex;justify-content: space-between;">
                   <p class="ranking-title">好评榜</p>
                   <el-dropdown trigger="click"  @command="positiveReview">
@@ -126,7 +130,7 @@
                 </div>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
-                    style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
+                    style="cursor: pointer;margin-top:15px;line-height: 22px;" @click="jumpRouter(item)">
                     <span class="portal-right-text blue-one" v-if="index == 0">
                       <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
                     </span>
@@ -146,7 +150,7 @@
                   </li>
                 </ul>
               </div>
-              <div style="margin-top:26px" class="portal-ranking ranking-bg1">
+              <div style="padding: 20px 15px;max-height: 222px;margin-top: 20px;" class="portal-ranking ranking-bg1">
                 <div style="display: flex;justify-content: space-between;">
                   <p class="ranking-title">人气榜</p>
                   <el-dropdown trigger="click"  @command="popularityReview">
@@ -161,7 +165,7 @@
                 </div>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
-                    style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
+                    style="cursor: pointer;margin-top:15px;line-height: 22px;" @click="jumpRouter(item)">
                     <span class="portal-right-text orange-one" v-if="index == 0">
                       <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                     </span>
@@ -181,11 +185,11 @@
                   </li>
                 </ul>
               </div>
-              <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="margin-top:26px">
+              <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="padding: 20px 15px;max-height: 222px;margin-top: 20px;">
                 <p class="ranking-title">推荐榜</p>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
-                    style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                    style="cursor: pointer;margin-top:15px;line-height: 22px;">
                     <router-link :to="'/case/detail?id=' + item.caseId">
                       <span class="portal-right-text blue-one" v-if="index == 0">
                         <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
@@ -547,9 +551,9 @@ export default {
       if (pdfTopBox.getBoundingClientRect().top < 1000) {
         document.querySelector('#pdfTopBox').style.cssText = "position:static";
       }
-      if (scrollTop > 800) {
+      if (scrollTop > 240) {
         this.isTopBoxShow = true;
-        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -624px;width:" + outerWidth + "px";
+        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: 10px;width:" + outerWidth + "px";
       } else {
         document.querySelector('#fixd-box').style.cssText = "position: static";
       }
@@ -730,7 +734,32 @@ export default {
     border-radius: 8px;
   }
 }
+.the_charts{
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 10px;
+  font-size: 18px;
+  max-width: 400px;
+  min-width: 260px;
+  height: 47px;
+  background: #DDEDFF;
+  border-radius: 8px;
+  .text{
+    font-size: 18px;
+    color: #387DF7;
+  }
+  .icon{
+    position: absolute;
+    font-size: 18px;
+    color: #387DF7;
+    right: 25px;
+    top: 50%;
+    transform: translateY(-50%);
+  }
 
+}
 .pdftext {
 
   // padding: 0 20px;
diff --git a/src/views/portal/case/Excellent.vue b/src/views/portal/case/Excellent.vue
index e2bb980b..49606908 100644
--- a/src/views/portal/case/Excellent.vue
+++ b/src/views/portal/case/Excellent.vue
@@ -13,7 +13,7 @@
             <div style="margin-right: 12px;">
               <el-select v-model="majorValue" @change="majorChange" placeholder="请选择专业">
                 <el-option
-                  v-for="item in speciData"
+                  v-for="item in speciDataNew"
                   :key="item.name"
                   :label="item.name"
                   :value="item.code">
@@ -44,7 +44,7 @@
                     <div class="case-tittext">
                       <span class="title-line-ellipsis" v-html="item.title"></span>
                     </div>
-                    <div class="case-activeText" @click.stop="toExcellent(item)">
+                    <div class="case-activeText" @click.stop="()=>{}">
                       <!-- <span v-if="item.breCommend" class="comWords"
                         style="background-color:rgba(232, 139, 72);">荐</span>
                       <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
@@ -146,14 +146,7 @@ import apiPlace from "@/api/phase2/place.js"
       return {
         majorId: '',
         rankMonth: '',
-        optionsMonth: 
-          [...Array(12)].map((item,i)=>{
-            return{
-                value: i+1 + '',
-                label: (i+1)+'月'
-              }
-          })
-        ,
+        optionsMonth: [],
         majorValue: '',
         monthValue: '',
         caseList: {
@@ -164,6 +157,8 @@ import apiPlace from "@/api/phase2/place.js"
         isSeach: false,
         domain: [],//组织领域
         speciData: [],//专业分类
+        speciDataNew: [],
+        monthsObject: {},
         treeList:[],
         queryCondition: {
           pageIndex: 1,
@@ -193,9 +188,12 @@ import apiPlace from "@/api/phase2/place.js"
     },
     mounted() {
       this.majorValue = this.$route.query.majorName
-      this.monthValue = parseInt(this.$route.query.riseRankTime.split('-')[1], 10) + '月'
+      const dateStr = this.$route.query.riseRankTime;
+      const year = dateStr.substring(2, 4) + '年';
+      const month = dateStr.substring(5, 7) + '月';
+      this.monthValue = year + month;
       this.getCaseData()
-      Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
+      Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes(),apiCase.queryAllTimePopularityOfMajor()]).then(rs => {
         if (rs[0].code == 200) {
           const {records} = rs[0].data
           records.forEach(item => {
@@ -224,6 +222,18 @@ import apiPlace from "@/api/phase2/place.js"
           })
           this.speciData = rs[1].result;
         }
+        if(rs[2].status == 200){
+          const months = Object.keys(rs[2].result)
+          this.monthsObject = rs[2].result
+          months.forEach(item=>{
+            rs[1].result.forEach(sub=>{
+              if(item == sub.code){
+                this.speciDataNew.push(sub)
+              }
+            })
+          })
+        }
+        this.selectMonth(this.$route.query.majorId)
       });
       this.loadTypeData();//加载分类
     },
@@ -285,14 +295,23 @@ import apiPlace from "@/api/phase2/place.js"
     },
     },
     methods: {
+      selectMonth(e){
+        this.optionsMonth = this.monthsObject[e].map(item=>{
+          return {
+            value: item,
+            label: item.split('-')[0]+'年'+item.split('-')[1]+'月'
+          }
+        })
+      },
       majorChange(e){
+        this.selectMonth(e)
         this.majorId = e
+        this.rankMonth = '20' + this.optionsMonth[0].value + '-' + '20'
+        this.monthValue = this.optionsMonth[0].label
         this.getCaseData()
       },
       monthChange(e){
-        const mon =  e.length == 1 ? '0'+e : e
-        const arr = this.$route.query.riseRankTime.split('-')
-        this.rankMonth = arr[0] + '-' + mon + '-' + arr[2]
+        this.rankMonth ='20' + e + '-' + '20'
         this.getCaseData()
       },
       orgDomainTranslate(code) { // 组织领域翻译
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 83fdaefe..c3e1f0f7 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -207,7 +207,7 @@
                           <!-- <span v-if="item.breCommend" class="comWords"
                             style="background-color:rgba(232, 139, 72);">荐</span>
                           <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
-                          <span v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
+                          <span @click.stop="()=>{}" v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
                             {{item.excellentTag}}
                           </span>
                           <span @click.stop="toExcellent(tag)" v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
@@ -292,104 +292,106 @@
       </div>
       <!-- 打开排行榜 -->
       <div class="xcontent2-minor">
-        <router-link class="the_charts" to="/case/charts">
-          <div class="text">排行榜</div>
-          <div class="icon">></div>
-        </router-link>
         <div id="fixd-box">
-          <div class="portal-ranking ranking-bg">
-            <div style="display: flex;justify-content: space-between;">
-              <p class="ranking-title">好评榜</p>
-              <el-dropdown trigger="click"  @command="positiveReview">
-                <span class="el-dropdown-link">
-                  {{favorableName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="total">总</el-dropdown-item>
-                  <el-dropdown-item command="quarter">季度</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+          <router-link class="the_charts" to="/case/charts">
+            <div class="text">排行榜</div>
+            <div class="icon">></div>
+          </router-link>
+          <div>
+            <div class="portal-ranking ranking-bg" style="padding: 20px 15px;max-height: 222px;">
+              <div style="display: flex;justify-content: space-between;">
+                <p class="ranking-title">好评榜</p>
+                <el-dropdown trigger="click"  @command="positiveReview">
+                  <span class="el-dropdown-link">
+                    {{favorableName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="total">总</el-dropdown-item>
+                    <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+              <ul class="ranking-data">
+                <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
+                  style="cursor: pointer;margin-top:15px;line-height: 22px;">
+                  <router-link :to="'/case/detail?id=' + item.caseId">
+                    <span class="portal-right-text blue-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                    </span>
+                    <!-- <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span> -->
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                  </router-link>
+                </li>
+              </ul>
             </div>
-            <ul class="ranking-data">
-              <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
-                style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                <router-link :to="'/case/detail?id=' + item.caseId">
-                  <span class="portal-right-text blue-one" v-if="index == 0">
-                    <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+            <div class="portal-ranking ranking-bg1" style="padding: 20px 15px;max-height: 222px;margin-top: 20px;">
+              <div style="display: flex;justify-content: space-between;">
+                <p class="ranking-title">人气榜</p>
+                <el-dropdown trigger="click"  @command="popularityReview">
+                  <span class="el-dropdown-link">
+                    {{popularityName}}<i class="el-icon-arrow-down el-icon--right"></i>
                   </span>
-                  <span class="portal-right-text blue-tow" v-if="index == 1">
-                    <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
-                  </span>
-                  <span class="portal-right-text blue-three" v-if="index == 2">
-                    <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
-                  </span>
-                  <!-- <span class="portal-right-text" v-if="index == 3">
-                    <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                  </span>
-                  <span class="portal-right-text" v-if="index == 4">
-                    <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                  </span> -->
-                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
-                </router-link>
-              </li>
-            </ul>
-          </div>
-          <div class="portal-ranking ranking-bg1" style="margin-top:26px">
-            <div style="display: flex;justify-content: space-between;">
-              <p class="ranking-title">人气榜</p>
-              <el-dropdown trigger="click"  @command="popularityReview">
-                <span class="el-dropdown-link">
-                  {{popularityName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="total">总</el-dropdown-item>
-                  <el-dropdown-item command="quarter">季度</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="total">总</el-dropdown-item>
+                    <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+              <ul class="ranking-data">
+                <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
+                  style="cursor: pointer;margin-top:15px;line-height: 22px;">
+                  <router-link :to="'/case/detail?id=' + item.caseId">
+                    <span class="portal-right-text orange-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                  </router-link>
+                </li>
+              </ul>
+            </div>
+            <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="margin-top:20px;padding: 20px 15px;max-height: 222px;">
+              <p class="ranking-title">推荐榜</p>
+              <ul class="ranking-data">
+                <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
+                  style="cursor: pointer;margin-top:15px;line-height: 22px;">
+                  <router-link :to="'/case/detail?id=' + item.caseId">
+                    <span class="portal-right-text blue-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                  </router-link>
+                </li>
+              </ul>
             </div>
-            <ul class="ranking-data">
-              <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
-                style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                <router-link :to="'/case/detail?id=' + item.caseId">
-                  <span class="portal-right-text orange-one" v-if="index == 0">
-                    <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
-                  </span>
-                  <span class="portal-right-text orange-tow" v-if="index == 1">
-                    <img :src="`${webBaseUrl}/images/list02.png`" alt="">
-                  </span>
-                  <span class="portal-right-text orange-three" v-if="index == 2">
-                    <img :src="`${webBaseUrl}/images/list03.png`" alt="">
-                  </span>
-                  <span class="portal-right-text" v-if="index == 3">
-                    <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                  </span>
-                  <span class="portal-right-text" v-if="index == 4">
-                    <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                  </span>
-                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
-                </router-link>
-              </li>
-            </ul>
-          </div>
-          <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="margin-top:26px">
-            <p class="ranking-title">推荐榜</p>
-            <ul class="ranking-data">
-              <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
-                style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                <router-link :to="'/case/detail?id=' + item.caseId">
-                  <span class="portal-right-text blue-one" v-if="index == 0">
-                    <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
-                  </span>
-                  <span class="portal-right-text blue-tow" v-if="index == 1">
-                    <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
-                  </span>
-                  <span class="portal-right-text blue-three" v-if="index == 2">
-                    <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
-                  </span>
-                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
-                </router-link>
-              </li>
-            </ul>
           </div>
         </div>
       </div>
@@ -663,7 +665,7 @@ export default {
     }
   },
   beforeRouteLeave (to, from, next) {
-    if(to.name !== 'caseDetail'){
+    if(to.name !== 'caseDetail'&&to.name !=='caseCharts'&&to.name !=='caseExcellent'){
       // console.log('我是外')
       this.queryCondition.pageIndex = 1
       this.search()
@@ -672,6 +674,7 @@ export default {
     }else{
       sessionStorage.setItem('pagesScroll', JSON.stringify(window.pageYOffset))
     }
+    window.removeEventListener("scroll", this.handleScroll);
     next()
   },
   beforeRouteEnter(to, from, next) {
@@ -832,13 +835,20 @@ export default {
     // window.addEventListener("scroll", this.handleScroll);
     // 获取年
     this.getYears();
+    this.allRequests()
   },
   beforeDestroy() {
     // window.removeEventListener("scroll", this.handleScroll);
-    // console.log('销毁了');/
+    // console.log('销毁了');
 
   },
   methods: {
+    allRequests(){
+      window.addEventListener(
+        "scroll",
+        this.handleScroll
+      );
+    },
     deleteFavorite(e){
       this.search()
     },
@@ -932,10 +942,16 @@ export default {
         this.$message.error('该案例已被删除')
         return
       }
-      if (refId) {
-        apiCase.startReadTimer(refId)
-      }
-      this.$router.push({ path: '/case/detail', query: { id } });
+      apiCase.details(id,true).then(res=>{
+        if (res.status == 200) {
+          if (refId) {
+            apiCase.startReadTimer(refId)
+          }
+          this.$router.push({ path: '/case/detail', query: { id } });
+        }else{
+          this.$message.error(res.message);
+        }
+      })
     },
     toExcellent(item){
       this.$router.push({path:'/case/excellent',query:{majorId:item.majorId,majorName:item.majorName,riseRankTime:item.riseRankTime.split(' ')[0]}})
@@ -1319,25 +1335,25 @@ export default {
     //   this.getCaseData();
     // },
     // 滚动请求
-    // handleScroll() {
-    //   let innerw = document.querySelector("#fixd-box");
+    handleScroll() {
+      let innerw = document.querySelector("#fixd-box");
     //   let innerHeight = document.querySelector("#case-list-content")
     //     .clientHeight;
     //   let outerHeight = document.documentElement.clientHeight;
-    //   let outerWidth = innerw.clientWidth;
-    //   let scrollTop = document.documentElement.scrollTop;
+      let outerWidth = innerw.clientWidth;
+      let scrollTop = document.documentElement.scrollTop;
     //   if (outerHeight + scrollTop + 350 >= innerHeight) {
     //     if (this.moreState == 1) {
     //       this.debounce(this.loadMore(), 5000);
     //     }
     //   }
-    //   if (scrollTop > 630) {
-    //     document.querySelector("#fixd-box").style.cssText =
-    //       "position: fixed;top: -400px;width:" + outerWidth + "px";
-    //   } else {
-    //     document.querySelector("#fixd-box").style.cssText = "position: static";
-    //   }
-    // },
+      if (scrollTop > 260) {
+        document.querySelector("#fixd-box").style.cssText =
+          "position: fixed;top: 10px;width:" + outerWidth + "px";
+      } else {
+        document.querySelector("#fixd-box").style.cssText = "position: static";
+      }
+    },
     useHotword(item) {
       this.keyWord = item.keyword;
       this.search();
@@ -1853,19 +1869,19 @@ export default {
     justify-content: center;
     align-items: center;
     margin-bottom: 10px;
-    font-size: 18px;
+    font-size: 17px;
     max-width: 400px;
     min-width: 260px;
-    height: 67px;
+    height: 47px;
     background: #DDEDFF;
     border-radius: 8px;
     .text{
-      font-size: 18px;
+      font-size: 17px;
       color: #387DF7;
     }
     .icon{
       position: absolute;
-      font-size: 18px;
+      font-size: 17px;
       color: #387DF7;
       right: 25px;
       top: 50%;

From 533a30e138bb04f9e451c7d2b4840248c627658c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 13 Sep 2024 09:21:56 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=90=B8=E9=A1=B6bug=E4=BF=AE=E5=A4=8D?=
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, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index c3e1f0f7..77b85042 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -665,7 +665,8 @@ export default {
     }
   },
   beforeRouteLeave (to, from, next) {
-    if(to.name !== 'caseDetail'&&to.name !=='caseCharts'&&to.name !=='caseExcellent'){
+    const isScroll = 'caseDetail,caseCharts,caseExcellent'
+    if(!isScroll.includes(to.name)){
       // console.log('我是外')
       this.queryCondition.pageIndex = 1
       this.search()
@@ -688,6 +689,7 @@ export default {
           top: JSON.parse(sessionStorage.getItem("pagesScroll")),
         })
         sessionStorage.removeItem("pagesScroll")
+        vm.allRequests()
       });
     })
   },

From 3c6d8539f51aa1acb4c042085e757af9394c2d0e Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Sat, 14 Sep 2024 09:19:54 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E6=89=8B?=
 =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=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 77b85042..1e9b7479 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -207,7 +207,7 @@
                           <!-- <span v-if="item.breCommend" class="comWords"
                             style="background-color:rgba(232, 139, 72);">荐</span>
                           <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
-                          <span @click.stop="()=>{}" v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
+                          <span @click.stop="()=>{}" v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;cursor: auto;">
                             {{item.excellentTag}}
                           </span>
                           <span @click.stop="toExcellent(tag)" v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">