修改caj阅读器打开失败的问题；修复第三方资源搜索的问题

src/libs/qiwen/globalFunction/file.js

@@ -262,7 +262,7 @@ const fileFunction = {
 			let pdfUrl = row[urlKey] || row.url//有部分url未加前缀，但是浏览器会自动寻址加到当前的主机
 
 			if (!pdfUrl.includes('http')) {
-				pdfUrl = process.env.VUE_APP_BASE_HOST + pdfUrl
+				pdfUrl = process.env.VUE_APP_BASE_PDF_FILE + pdfUrl
 			}
 			// console.log('pdfUrl', pdfUrl);
 			// return
@@ -303,14 +303,15 @@ const fileFunction = {
 					Message.error('预览失败！请检查该文件路径是否正确。文件路径：' + pdfUrl)
 					return
 				}
-				let resolve = router.resolve({
-					path: '/pdfReader',
-					query: {
-						fileId,
-						url: pdfUrl
-					}
-				})
-				window.open(resolve.href, '_blank')
+				// let resolve = router.resolve({
+				// 	path: '/pdfReader',
+				// 	query: {
+				// 		fileId,
+				// 		url: pdfUrl
+				// 	}
+				// })
+				// window.open(resolve.href, '_blank')
+				window.open(pdfUrl,'_blank')
 				return false
 			}
 

src/router/index.js

@@ -75,19 +75,19 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/caj',
-    component: Layout,
-    redirect: '/cajDownload',
-    children: [
-      {
-        path: 'cajDownload',
-        component: () => import('@/views/caj/index'),
-        name: 'cajDownload',
-        meta: { title: 'caj阅读页', icon: 'caj-logo', affix: true }
-      }
-    ]
-  },
+  // {
+  //   path: '/caj',
+  //   component: Layout,
+  //   redirect: '/cajDownload',
+  //   children: [
+  //     {
+  //       path: 'cajDownload',
+  //       component: () => import('@/views/caj/index'),
+  //       name: 'cajDownload',
+  //       meta: { title: 'caj阅读页', icon: 'caj-logo', affix: true }
+  //     }
+  //   ]
+  // },
   // ...staticRouters,
   {
     path: '/user',

src/utils/file.js

@@ -159,7 +159,7 @@ export function openFile(file, $el, localStorage, flag = false) {
 // 打开cajViwer下载页面
 export function handleDownloadCajViewer() {
     let resolve = router.resolve({
-        path: '/cajDownload',
+        path: '/caj',
     })
     window.open(resolve.href, '_blank')
     // let a = document.createElement("a");

src/views/caj/index.vue

@@ -493,6 +493,9 @@ export default {
       ...fullUrl,
     };
   },
+  mounted(){
+    console.log(123,fullUrl)
+  },
   methods: {
     changeDemo(n) {
       this.currentDemo = n;
@@ -601,9 +604,9 @@ body {
   padding-top: 60px;
 }
 .content_title {
-  width: 80%;
+  width: 100%;
   height: 130px;
-  margin-left: 10%;
+  // margin-left: 10%;
   margin-top: -20px;
 }
 .content_title ul {
@@ -627,7 +630,7 @@ body {
 }
 .active {
   background-image: url(~@/assets/images/caj/title_bg2.png) !important;
-  color:#fff;
+  color: #fff;
 }
 .content_head {
   width: 80%;
@@ -677,8 +680,8 @@ body {
   float: left;
   line-height: 60px;
   text-align: center;
-  &:nth-child(1){
-    padding-left: 140px;
+  &:nth-child(1) {
+    // padding-left: 140px;
   }
 }
 .download:hover {

src/views/caj/urls.js

 
 const baseUrl = process.env.VUE_APP_BASE_HOST
-const folder = '/SoftWare'
+const folder = '/software/software'
 const urls = {
     TXUOS_INTER:
         "/TXUOS/inter/net.cnki.cajviewer_1.1.1-3_amd64.deb",

src/views/resource/external/index.vue

@@ -8,7 +8,7 @@
       v-loading="loading"
       previewType="caj"
       currentKey="pageNo"
-      sizeKey="pageCount"
+      sizeKey="pageSize"
       totalKey="totalElements"
     />
   </div>
@@ -32,7 +32,7 @@ export default {
       list: {
         records: [],
         totalElements: 0,
-        pageCount: 10,
+        pageSize: 10,
         pageNo: 1,
       },
       loading: false,
@@ -49,11 +49,11 @@ export default {
       if (refresh) {
         this.list.pageNo = 1;
       }
-      const { pageNo, pageCount } = this.list;
+      const { pageNo, pageSize } = this.list;
       const params = {
         keyword,
         pageNo,
-        pageCount,
+        pageSize,
         year: currentYear,
       };
       let request;
@@ -74,7 +74,7 @@ export default {
       let res = await request(params);
       if (res.code == 200) {
         this.list = res.data;
-        this.list.pageCount = Number(this.list.pageCount);
+        this.list.pageSize = Number(this.list.pageSize);
         this.list.pageNo = Number(this.list.pageNo);
         this.loading = false;
       }