From 38406a926e1062a751ebd96e1fd85ee886b5a64e Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期二, 18 六月 2024 11:01:28 +0800
Subject: [PATCH] login

---
 src/views/readerPages/webHome.vue |  226 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 175 insertions(+), 51 deletions(-)

diff --git a/src/views/readerPages/webHome.vue b/src/views/readerPages/webHome.vue
index d7fb39c..5447ef1 100644
--- a/src/views/readerPages/webHome.vue
+++ b/src/views/readerPages/webHome.vue
@@ -93,7 +93,7 @@
       <!-- 鑿滃崟鍐呭 -->
       <div class="menuContent" v-if="menuState.open">
         <div class="searchBox">
-          <div class="inputBox" v-if="activeMenu !== '璧勬簮' && activeMenu !== '涔犻'">
+          <div class="inputBox" v-if="activeMenu !== '璧勬簮' && activeMenu !== '棰樺簱'">
             <el-input
               class="custom-input"
               placeholder="璇疯緭鍏ュ唴瀹�"
@@ -118,15 +118,32 @@
               <div :class="resourceType == 'teacher' ? 'text' : 'line'"></div>
             </div>
           </div>
-          <div v-if="activeMenu == '涔犻'" class="resourceTab">
-            <div class="tabItem hover" @click="selectExercisesType('exercises')">
+          <div v-if="activeMenu == '棰樺簱'" class="resourceTab">
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('exercises')"
+              v-if="bookConfig.textbookComponents.indexOf('3D3B4F55') > -1"
+            >
               <div>涔犻</div>
               <div :class="exercisesType == 'exercises' ? 'text' : 'line'"></div>
             </div>
-            <hr class="hr" />
-            <div class="tabItem hover" @click="selectExercisesType('wrong')">
+            <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('AFC1A288') > -1" />
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('wrong')"
+              v-if="bookConfig.textbookComponents.indexOf('AFC1A288') > -1"
+            >
               <div>閿欓鏈�</div>
               <div :class="exercisesType == 'wrong' ? 'text' : 'line'"></div>
+            </div>
+            <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('A434F2C0') > -1" />
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('collection')"
+              v-if="bookConfig.textbookComponents.indexOf('A434F2C0') > -1"
+            >
+              <div>鏀惰棌</div>
+              <div :class="exercisesType == 'collection' ? 'text' : 'line'"></div>
             </div>
           </div>
         </div>
@@ -192,7 +209,7 @@
           </div>
         </div>
         <!-- 绗旇 -->
-        <div class="notesBox" v-if="activeMenu == '绗旇'">
+        <div class="notesBox" v-if="activeMenu == '绗旇'" v-loading="listLoading">
           <div class="screenBox">
             <div class="title">绛涢��</div>
             <div class="flex1 hover" @click="searchClick('all')">
@@ -210,7 +227,7 @@
               ></div>
             </div>
           </div>
-          <div class="list-box" v-loading="listLoading">
+          <div class="list-box">
             <div v-if="scribeData.noteList.length > 0">
               <div v-for="(noteItem, index) in scribeData.noteList" :key="noteItem">
                 <div class="chapterName">
@@ -413,8 +430,8 @@
           </div>
         </div>
         <!-- 鎴浘 -->
-        <div class="screenshotList" v-if="activeMenu == '鎴浘'">
-          <div class="list-box" v-loading="listLoading">
+        <div class="screenshotList" v-if="activeMenu == '鎴浘'" v-loading="listLoading">
+          <div class="list-box">
             <div class="screenshot" v-if="screenshotList.length > 0">
               <div v-for="(item, index) in screenshotList" :key="item" class="captureItem">
                 <div class="imgBox" @mouseover="showDelete = index" @mouseleave="showDelete = null">
@@ -438,8 +455,8 @@
           </div>
         </div>
         <!-- 涔︾ -->
-        <div class="reMarkList" v-if="activeMenu == '涔︾'">
-          <div class="list-box" v-loading="listLoading">
+        <div class="reMarkList" v-if="activeMenu == '涔︾'" v-loading="listLoading">
+          <div class="list-box">
             <div v-if="reMarkList.length > 0">
               <div v-for="(item, index) in reMarkList" :key="index" class="reMarkItem">
                 <div class="reMarkCon hover" @click="goReMark(item)">
@@ -455,7 +472,7 @@
             </div>
           </div>
         </div>
-        <div class="questionList" v-if="activeMenu == '涔犻'">
+        <div class="questionList" v-if="activeMenu == '棰樺簱'" v-loading="listLoading">
           <div class="resourceSearchBox">
             <div class="inputBox">
               <el-input
@@ -1172,6 +1189,17 @@
       <newWord :resourceUrl="resourceUrl" />
     </div>
   </el-dialog>
+  <el-dialog
+    title="閿欓鏈�"
+    align-center
+    v-model="wrongQuestionVisble"
+    width="800"
+    class="myDialogs"
+  >
+    <div class="wendabox">
+      <wrongQuestion />
+    </div>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -1189,6 +1217,7 @@
 import moment from 'moment'
 import dictionary from '@/views/components/dictionary.vue'
 import newWord from '@/views/components/newWord.vue'
+import wrongQuestion from '@/views/components/wrongQuestion.vue'
 import { ElMessage, ElMessageBox, valueEquals } from 'element-plus'
 import logo from '@/assets/images/header/logo.png'
 import mulu from '@/assets/images/menu/mulu.png'
@@ -1198,6 +1227,7 @@
 import jietu from '@/assets/images/menu/jietu.png'
 import biaoqian from '@/assets/images/menu/biaoqian.png'
 import allSearch from '@/assets/images/menu/allSearch.svg'
+import question from '@/assets/images/menu/question.svg'
 import topbg from '@/assets/images/header/top-bg.png'
 import setting from '@/assets/images/operation/setting.png'
 import search from '@/assets/images/operation/search.png'
@@ -1211,7 +1241,7 @@
 import shengzikapian from '@/assets/images/menu/shengzikapian.png'
 import hudongwenda from '@/assets/images/menu/hudongwenda.png'
 import siweidaotu from '@/assets/images/menu/siweidaotu.png'
-import GGB from '@/assets/images/menu/GGB.png'
+import GGB from '@/assets/images/menu/function.png'
 import jihe from '@/assets/images/menu/jihe.png'
 import python from '@/assets/images/menu/python.png'
 import cjiajia from '@/assets/images/menu/C++.png'
@@ -1528,11 +1558,14 @@
       icon: biaoqian,
       isShow: bookConfig.value.textbookComponents.indexOf('CF2E1400') > -1
     },
-    // {
-    //   name: '涔犻',
-    //   icon: zhishitupu,
-    //   isShow: true
-    // }
+    {
+      name: '棰樺簱',
+      icon: question,
+      isShow:
+        bookConfig.value.textbookComponents.indexOf('3D3B4F55') > -1 ||
+        bookConfig.value.textbookComponents.indexOf('AFC1A288') > -1 ||
+        bookConfig.value.textbookComponents.indexOf('A434F2C0') > -1
+    }
   ]
   teachToolsMenuData = [
     {
@@ -1694,6 +1727,7 @@
       listLoading.value = false
     })
     .catch(function (error) {
+      listLoading.value = false
       console.log(error)
     })
 }
@@ -1930,6 +1964,7 @@
       })
       .catch(function (error) {
         console.log(error)
+        listLoading.value = false
       })
   } else {
     ElMessageBox.confirm('璇峰厛鐧诲綍锛�', {
@@ -1939,7 +1974,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2026,25 +2067,30 @@
   if (token) {
     listLoading.value = true
     questionList.value = []
-    axios.get(bookConfig.value.resourceUrl + '/resource.json').then(function (response) {
-      var json = response.data
-      // 澶勭悊鑾峰彇鍒扮殑json鏁版嵁
-      if (json.length > 0) {
-        json.forEach((item) => {
-          if (item.resourceType == '涔犻') {
-            let text = searchText.value.replace(/^\s*|\s*$/g, '')
-            if (searchText.value) {
-              if (item.resourceName.indexOf(text) > -1) {
+    axios
+      .get(bookConfig.value.resourceUrl + '/resource.json')
+      .then(function (response) {
+        var json = response.data
+        // 澶勭悊鑾峰彇鍒扮殑json鏁版嵁
+        if (json.length > 0) {
+          json.forEach((item) => {
+            if (item.resourceType == '涔犻') {
+              let text = searchText.value.replace(/^\s*|\s*$/g, '')
+              if (searchText.value) {
+                if (item.resourceName.indexOf(text) > -1) {
+                  questionList.value.push(item)
+                }
+              } else {
                 questionList.value.push(item)
               }
-            } else {
-              questionList.value.push(item)
             }
-          }
-        })
-      }
-      listLoading.value = false
-    })
+          })
+        }
+        listLoading.value = false
+      })
+      .catch(() => {
+        listLoading.value = false
+      })
   } else {
     ElMessageBox.confirm('璇峰厛鐧诲綍锛�', {
       confirmButtonText: '鍘荤櫥褰�',
@@ -2053,17 +2099,27 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
 }
+
+//閿欓鏈�
+const wrongQuestionVisble = ref(false)
 const selectExercisesType = (type) => {
   exercisesType.value = type
   searchText.value = ''
-
   if (type == 'exercises') {
     getExercisesList()
+  } else if (type == 'wrong') {
+    questionList.value = []
   } else {
     questionList.value = []
   }
@@ -2101,7 +2157,7 @@
       break
     case '妫�绱�':
       break
-    case '涔犻':
+    case '棰樺簱':
       getExercisesList()
       break
   }
@@ -2253,7 +2309,7 @@
     case '涔︾':
       getReMarkList()
       break
-    case '涔犻':
+    case '棰樺簱':
       getExercisesList()
       break
     case '妫�绱�':
@@ -2371,7 +2427,7 @@
     case '妫�绱�':
       allSearchReault.value = []
       break
-    case '涔犻':
+    case '棰樺簱':
       getExercisesList()
       break
   }
@@ -2421,7 +2477,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2660,7 +2722,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2700,7 +2768,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2774,7 +2848,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2879,7 +2959,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3080,7 +3166,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {
         showToolBox.value = false
@@ -3180,7 +3272,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3264,7 +3362,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3345,7 +3449,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3625,11 +3735,25 @@
 const layoutBtn = () => {
   localStorage.removeItem('token')
   localStorage.removeItem('userInfo')
-  router.push('/login')
+  // router.push('/login')
+  if (sessionStorage.getItem('loginCtx')) {
+    window.open(sessionStorage.getItem('loginCtx'))
+  } else {
+    router.replace({
+      path: '/login'
+    })
+  }
 }
 const goLogin = () => {
   localStorage.removeItem('userInfo')
-  router.push('/login')
+  // router.push('/login')
+  if (sessionStorage.getItem('loginCtx')) {
+    window.open(sessionStorage.getItem('loginCtx'))
+  } else {
+    router.replace({
+      path: '/login'
+    })
+  }
 }
 </script>
 

--
Gitblit v1.9.1