Merge remote-tracking branch 'boe/dev0731' into dev0731

src/api/modules/cases.js

@@ -180,6 +180,13 @@ const startReadTimer =  (caseRecommendId) =>  ajax.get(`/xboe/m/boe/cases/recomm
  */
 const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/recordBrowseDuration',data)
 
+/**年份查询
+ *
+*/
+const caseYears = function (query = {}) {
+  return ajax.post('/xboe/m/boe/cases/caseYears', query);
+}
+
 
 
 
@@ -204,5 +211,6 @@ export default {
   exportCases,
   exports,
   startReadTimer,
-  endReadTimer
+  endReadTimer,
+  caseYears
 }

src/views/portal/case/Index.vue

@@ -116,7 +116,7 @@
                   {{ caseList.count }}</span> 条数据</div>
               <el-select v-model="years" multiple collapse-tags
                 style="margin-left: 20px; width: 147px; border-radius:20px !important;" placeholder="全部年份">
-                <el-option v-for="item in allYears" :key="item.value" :label="item.label" :value="item.value">
+                <el-option v-for="item in caseYears" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </div>
@@ -393,7 +393,7 @@ export default {
         pageSize: 5,
         // orderField: "excellent",
         majorType: '', //专业分类code
-        orderAsc: false,
+        // orderAsc: false,
         // isTop: true,
         excellent: true,
         keyWord: '',
@@ -406,7 +406,11 @@ export default {
         parent: '',
         children: [],
         name: '',
-        years: []
+        years: [],
+        // 随机
+        notInIds: [],//重复的id
+        orderField: "id",
+        orderAsc: false,//排序
       },
       keyWord: "",
       anking: 2,
@@ -474,13 +478,6 @@ export default {
       });
       return list;
     },
-    allYears() {
-      let nowYear = new Date().getFullYear()
-      return Array.from({ length: 10 }, (_, i) => ({
-        value: (nowYear - i).toString(),
-        label: (nowYear - i).toString(),
-      }));
-    },
     oneTagAll() {
       return !this.domain.some(item => item.fielclass);
     },
@@ -494,6 +491,72 @@ export default {
       return !this.speciData.some(item => item.fielclass);
     }
   },
+  created() {
+    (() => {
+      const allData = {
+        0: {
+          orderField: 'id',
+          orderAsc: false
+        },
+        1: {
+          orderField: 'id',
+          orderAsc: true
+        },
+        2: {
+          orderField: 'title',
+          orderAsc: false
+        },
+        3: {
+          orderField: 'title',
+          orderAsc: true
+        },
+        4: {
+          orderField: 'sysCreateTime',
+          orderAsc: false
+        },
+        5: {
+          orderField: 'sysCreateTime',
+          orderAsc: true
+        },
+        6: {
+          orderField: 'authorId',
+          orderAsc: false
+        },
+        7: {
+          orderField: 'authorId',
+          orderAsc: true
+        },
+        8: {
+          orderField: 'authorName',
+          orderAsc: false
+        },
+        9: {
+          orderField: 'authorName',
+          orderAsc: true
+        },
+      }
+      const allArr = Object.keys(allData)
+      let recordsArr = JSON.parse(sessionStorage.getItem("recordsArr")) || [];
+      let difference = allArr.filter(element => !recordsArr.includes(element));
+      if (recordsArr.length === allArr.length) {
+        difference = [...allArr]
+        recordsArr = []
+      }
+      let random = Math.floor(Math.random() * difference.length)
+      for (let i = 0; i < difference.length; i++) {
+        if (i == random) {
+          recordsArr.push(difference[i])
+          break;
+        }
+      }
+      sessionStorage.setItem("recordsArr", JSON.stringify(recordsArr))
+      const dataList = (data) => {
+        this.queryCondition.orderField = data.orderField
+        this.queryCondition.orderAsc = data.orderAsc
+      }
+      dataList(allData[random])
+    })()
+  },
   mounted() {
     let $this = this;
     // if(this.speciData.length==0){
@@ -564,6 +627,8 @@ export default {
     this.getPositive();
     this.couresreso();
     // window.addEventListener("scroll", this.handleScroll);
+    // 获取年
+    this.getYears();
 
   },
   beforeDestroy() {
@@ -572,6 +637,18 @@ export default {
 
   },
   methods: {
+    getYears() {
+      apiCase.caseYears().then(res => {
+        if (res.status == 200) {
+          const { result } = res;
+          console.log(result);
+          this.caseYears = result.map(year => ({
+            value: year,
+            label: year,
+          }))
+        }
+      })
+    },
     // 查看率的时间
     toCaseDetail(id, refId) {
       if (refId) {

src/views/portal/course/Index.vue

@@ -4,7 +4,7 @@
       <portal-header current="course" textColor="#fff" @emitInput="emitInput" @showClass="showClass"></portal-header>
     </div>
     <div style="padding-top:30px">
-      <div class="xcontent2" v-if="!newData">
+      <div class="xcontent2">
         <div class="navTitle">
           <a @click="handleClearTags">课程分类&nbsp;</a>
           <span v-if="navTitle.length">></span>
@@ -276,21 +276,6 @@
                 </div>
             </div>
           </div> -->
-
-          <!-- 线上品牌的nav -->
-          <div class="topNav" v-if="newData">
-            <div class="navTitle">
-              <a @click="handleClearTags">课程分类&nbsp;</a>
-              <span v-if="navTitle.length">></span>
-              <template v-if="navTitle.length">
-                <div class="oneTitle" v-for="(item, index) in navTitle" :key="item.id"
-                  @click="handleOptionClick(item, index)">
-                  <span class="titleName">&nbsp;{{ item.name }}&nbsp;</span>
-                  <span v-if="index !== navTitle.length - 1">></span>
-                </div>
-              </template>
-            </div>
-          </div>
           <!-- 内容导航 -->
           <div class="topNav" v-if="!newData">
             <div class="search-div nav" style="height: 100px;flex: 1;">