From 18d886c2f23dc5c032ebcf42bbb39c739d908a4f Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期二, 05 十一月 2024 15:49:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TextbookReader
---
src/views/readerPages/webHome.vue | 1
src/assets/js/config.ts | 4 +
src/views/readerPages/home.vue | 58 +++++++++++++----------------
src/child.ts | 18 +++++++++
src/views/examination/index.vue | 2
5 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/src/assets/js/config.ts b/src/assets/js/config.ts
index c6832f7..9ef7968 100644
--- a/src/assets/js/config.ts
+++ b/src/assets/js/config.ts
@@ -1,12 +1,14 @@
// 娴嬭瘯
export const requestCtx = "https://jsek.bnuic.com"; //jsek
export const appId = 3;
+// export const requestCtx = "http://182.92.203.7:3007"; //jsek
+// export const appId = 27
export const requestTimeOut = 300000; // 璇锋眰瓒呮椂鏃堕棿
export const tokenKey = "token";
export const userInfoKey = "website-front-userInfo"; // 鐢ㄦ埛淇℃伅key
export const appRefCode = "jingshieke";
export const goodsStore = `defaultGoodsStore${appId}`; // 榛樿鍟嗗搧搴�(涔﹀煄)
export const digitalTextbooks = "jsek_digitalTextbooks";//鏁板瓧鏁欐潗
-
export const loginCtx = "http://jsysf.bnuic.com/home/#/digitalTextbooks?login=true"; //鐧诲綍閾炬帴
+// export const loginCtx = ""; //鐧诲綍閾炬帴
diff --git a/src/child.ts b/src/child.ts
index 0153d60..67dd7f9 100644
--- a/src/child.ts
+++ b/src/child.ts
@@ -58,6 +58,24 @@
entry: '//jsek.bnuic.com/books/book/artAndDrama',
container: '#container',
activeRule: '/home' //鍖归厤鎵�鏈変互/subPath寮�澶寸殑涓哄瓙搴旂敤
+ },
+ civilAviation:{
+ name: 'app-content',
+ entry: '//jsek.bnuic.com/books/book/civilAviation',
+ container: '#container',
+ activeRule: '/home' //鍖归厤鎵�鏈変互/subPath寮�澶寸殑涓哄瓙搴旂敤
+ },
+ civilAviationServices:{
+ name: 'app-content',
+ entry: '//jsek.bnuic.com/books/book/civilAviationServices',
+ container: '#container',
+ activeRule: '/home' //鍖归厤鎵�鏈変互/subPath寮�澶寸殑涓哄瓙搴旂敤
+ },
+ botany:{
+ name: 'app-content',
+ entry: '//182.92.203.7:3007/books/book/botany',
+ container: '#container',
+ activeRule: '/home' //鍖归厤鎵�鏈変互/subPath寮�澶寸殑涓哄瓙搴旂敤
}
}
diff --git a/src/views/examination/index.vue b/src/views/examination/index.vue
index 2cba8ed..6499ea5 100644
--- a/src/views/examination/index.vue
+++ b/src/views/examination/index.vue
@@ -210,7 +210,7 @@
examination.loading = true
examination.submitStatus = false
examination.cardList = []
- examination.collectList = []
+ // examination.collectList = []
examination.errorList = []
goTop()
if (props.type == 'option') {
diff --git a/src/views/readerPages/home.vue b/src/views/readerPages/home.vue
index 42c8721..0f45f5e 100644
--- a/src/views/readerPages/home.vue
+++ b/src/views/readerPages/home.vue
@@ -63,47 +63,41 @@
height: 100%;
}
-
-.el-dialog {
+.custom-dialog {
+ .el-dialog {
padding: 0;
}
+ .el-dialog__header {
+ background-color: rgba(0, 0, 0, 0.8);
+ padding: 0;
+ padding: 10px 0;
-.el-dialog__header {
- background-color: rgba(0, 0, 0, 0.8);
- padding: 0;
- padding: 10px 0;
+ .header_title {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: #fff;
+ font-weight: 900;
+ font-size: 16px;
+ font-family: 'FZLTXIHJW';
+ padding: 5px 20px;
+ box-sizing: border-box;
- .header_title {
- display: flex;
- justify-content: space-between;
- align-items: center;
- color: #fff;
- font-weight: 900;
- font-size: 16px;
- font-family: 'FZLTXIHJW';
- padding: 5px 20px;
- box-sizing: border-box;
+ span:nth-child(2):hover {
+ cursor: pointer;
+ }
+ }
- span:nth-child(2):hover {
- cursor: pointer;
+ .el-dialog__title,
+ .el-dialog__headerbtn .el-dialog__close {
+ color: #fff;
+ font-weight: 900;
+ font-size: 16px;
+ font-family: 'FZLTXIHJW';
}
}
-
- .el-dialog__title,
- .el-dialog__headerbtn .el-dialog__close {
- color: #fff;
- font-weight: 900;
- font-size: 16px;
- font-family: 'FZLTXIHJW';
- }
}
-
-
-
-
-
-
.pdfModal {
diff --git a/src/views/readerPages/webHome.vue b/src/views/readerPages/webHome.vue
index 5aab5b3..e5858b5 100644
--- a/src/views/readerPages/webHome.vue
+++ b/src/views/readerPages/webHome.vue
@@ -1291,6 +1291,7 @@
</el-dialog>
</template>
<script setup lang="ts">
+import examination from '@/views/examination/index.vue'
import { ref, reactive, watch, onMounted, onBeforeMount, onBeforeUnmount, inject } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { ElMessage, ElMessageBox, valueEquals } from 'element-plus'
--
Gitblit v1.9.1