Merge pull request 'qinqing_dev' (#276) from qinqing_dev into main

Reviewed-on: #276

src/renderer/public/pdfjs-dist/web/viewer.html

@@ -294,7 +294,7 @@ See https://github.com/adobe-type-tools/cmap-resources
                 </span>
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
-              <div id="toolbarViewerRight" style="display: none;">
+              <div id="toolbarViewerRight">
                 <div id="editorModeButtons" class="splitToolbarButton toggled" role="radiogroup">
                   <button id="editorHighlight" class="toolbarButton" hidden="true" disabled="disabled" title="Highlight" role="radio" aria-checked="false" aria-controls="editorHighlightParamsToolbar" tabindex="31" data-l10n-id="pdfjs-editor-highlight-button">
                     <span data-l10n-id="pdfjs-editor-highlight-button-label">Highlight</span>

src/renderer/src/components/PdfJs/index.vue

@@ -21,7 +21,6 @@ const fileUrl = getAppInstallUrl('pdfjs-dist/web/viewer.html', 'user', '\\out\\r
 onMounted(() => {
     /** 将传入的pdf地址进行编码，防止中文识别错误 */
     pdfUrl.value = fileUrl + encodeURIComponent(props.url)
-    console.log('组件',pdfUrl.value);
 })
 </script>
 

src/renderer/src/views/teach/standardAnalysis/index.vue

@@ -7,7 +7,7 @@
           <el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
         </div>
         <div class="stand-head-right">
-          <div class="stand-head-right-tit">{{booktitle}}</div>
+          <div class="stand-head-right-tit">{{bookInfo ? bookInfo.bookName : ''}}</div>
           <i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
           <div class="stand-head-right-row">
             <div class="stand-head-right-row-time">更新2024.9.10</div>
@@ -68,11 +68,11 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="dialogVisible" title="切换教材" append-to-body  width="550">
+    <el-dialog v-model="dialogVisible" title="切换课标" append-to-body  width="550">
       <div class="booklist">
         <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
           <el-image class="bookimg" :src="item.avartar" />
-          <div class="bookname">{{item.fileurl.replace('.txt', '')}}</div>
+          <div class="bookname">{{item.bookName}}</div>
         </div>
       </div>
     </el-dialog>
@@ -105,7 +105,6 @@ const headref = ref(null);
 const searchref = ref(null);
 const listHeight = ref(0);
 const dialogVisible = ref(false);
-const booktitle = ref('');
 const bookInfo = ref(null);
 const booksel = ref(0);
 const bookList = ref([])
@@ -246,23 +245,24 @@ const getAllSubject = async () => {
   const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
   const { edustage, edusubject } = userStore.user;
   rows && rows.map(item => {
-    if(item.edustage === edustage && item.edusubject === edusubject){
+    if(edustage === item.edustage  && item.edusubject === edusubject){
-      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
+      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: bookNameFormat(item.edustage,item.edusubject)}
     }
     if(item.fileurl !== ''){
-      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
+      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: bookNameFormat(item.edustage,item.edusubject)})
     }
   })
   const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
   booksel.value = textselidx
-  booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
   const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filePath)
 }
+const bookNameFormat = (edustage,edusubject) => {
+  return `${edustage}-${edusubject}`
+}
 const bookChange = async (item, idx) => {
   booksel.value = idx
   bookInfo.value = {...item}
-  booktitle.value = item.fileurl.replace('.txt','')
   pdfUrl.value = '';
   const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filepath)
@@ -539,9 +539,9 @@ onMounted(async () => {
       width: 130px;
       height: 180px;
     }
-    .name{
+    .bookname{
       font-size: 14px;
-      color: #3b3b3b;
+      text-align: center;
     }
   }
   .item:hover{

src/renderer/src/views/textbookAnalysis/index.vue

@@ -244,19 +244,17 @@ const getData = (data) => {
 // 获取学科
 const getAllSubject = async () => {
   const { edustage, edusubject } = userStore.user;
-  const { rows } = await listEvaluation({ itemkey: "version", edustage, edusubject, pageSize: 500 })
+  const { rows } = await listEvaluation({ itemkey: "version", edustage, edusubject, orderby: 'orderidx asc', pageSize: 500 })
-  rows && rows.map(item => {
+  const dataList = [];
-    if(item.edustage === edustage && item.edusubject === edusubject){
+  rows && rows.map((item,idx) => {
-      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
-    }
     if(item.fileurl !== ''){
-      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
+      dataList.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
     }
   })
-  const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
+  bookList.value = dataList
-  booksel.value = textselidx
+  bookInfo.value = {...dataList[0],avartar: dataList[0].avartar}
-  booktitle.value = bookList.value[textselidx].fileurl.replace('.txt','')
+  booktitle.value = dataList[0].fileurl.replace('.txt','')
-  const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
+  const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + dataList[0].fileurl.replace('.txt','.pdf')
   await loadPdfAnimation(filePath)  
 }
 const bookChange = async (item, idx) => {