diff --git a/src/utils/common/compUtils.ts b/src/utils/common/compUtils.ts
index b36eebb..a783570 100644
--- a/src/utils/common/compUtils.ts
+++ b/src/utils/common/compUtils.ts
@@ -4,7 +4,7 @@ import { isArray } from '/@/utils/is';
import { FormSchema } from '/@/components/Form';
const globSetting = useGlobSetting();
-const baseApiUrl = globSetting.domainUrl;
+export const baseApiUrl = globSetting.domainUrl;
/**
* 获取文件服务访问路径
* @param fileUrl 文件路径
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 23fc682..83f7ab1 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -199,9 +199,10 @@ export const transform: AxiosTransform = {
* @description: 响应错误处理
*/
responseInterceptorsCatch: (error: any) => {
- //console.log('报错了！',error,error.config,error.request,error.response,error.isAxiosError,error.toJSON(),);
-
- if (!error?.response?.status) {//找不到返回值，也找不到状态码，则认为是重定向后跨域了，
+ console.log('报错了！',error,error.message,error.config,error.request,error.response,error.isAxiosError,error.toJSON(),);
+ if(error.message?.includes('Network Error')){
+ return Promise.reject(error);
+ }else if (!error?.response?.status) {//找不到返回值，也找不到状态码，则认为是重定向后跨域了，
//window.location.href = error?.config?.url || window.location.href;//跳转不正常。。。
//window.location.href = window.location.href;
//useSso().ssoLoginOut();
diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue
index d366bf0..c337325 100644
--- a/src/views/site/common/video/videojs/viewPage.vue
+++ b/src/views/site/common/video/videojs/viewPage.vue
@@ -17,13 +17,37 @@
填写评价表
- {{ ktangInfo.zc || ' ' }} {{ ktangInfo.skjs || ' ' }} 学分：{{ ktangInfo.xf || ' ' }} 选课人数：{{ ktangInfo.xkrs || ' ' }} 课程性质：{{ ktangInfo.kcxz || ' ' }} 开课单位：{{ ktangInfo.kkdw || ' ' }}
+ {{ ktangInfo.zc || ' ' }} {{ ktangInfo.skjs || ' ' }} 学分：{{ ktangInfo.xf || ' ' }}
+ 选课人数：{{ ktangInfo.xkrs || ' ' }}
+ 课程性质：{{ ktangInfo.kcxz || ' ' }}
+ 开课单位：{{ ktangInfo.kkdw || ' ' }}
+ 节次：{{ ktangInfo.hh || ' ' }}
+
+
+ 课程介绍：{{ ktangInfo?.zyJxdg?.kcjs }}
{{ mainVideoCardBoxTitle || '' }}
-
本教室容量：{{ktangInfo?.jiaoshirongliang?.jsrl}}座位
+
+ AI识别出勤率：{{ calcPercentage((ktangInfo?.detectionMain?.averageNum || 0),(ktangInfo?.jiaoshirongliang?.jsrl || 0))}}
+ 本教室容量：{{ktangInfo?.jiaoshirongliang?.jsrl}}座位
+
+
@@ -103,6 +127,7 @@ import KcErrorreportIndexModal from '/@/views/kc/kcErrorreport/components/KcErro
import videojs from "video.js";
import { getSysConfig } from '/@/views/site/utils/index';
import { useMessage } from '/@/hooks/web/useMessage';
+import { baseApiUrl, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
const { createMessage, createInfoModal, createErrorModal } = useMessage();
@@ -114,6 +139,7 @@ const tingKeZuJiAddModal = ref
({});
const curentPlayerVideo = ref({});
const kcCardBoxTitle = ref('');
const ktangInfo = ref({});
+// const jxdgInfo = ref({});
const mainVideoCardBoxTitle = ref('');
const tableData = ref([])
const suibiList = ref([])
@@ -130,7 +156,7 @@ enum Api {
querySuibi = '/kc/kcKetangSuibi/list',
addSuibi = '/kc/kcKetangSuibi/add',
// editSuibi = '/kc/kcKetangSuibi/edit'
- getKtangInfo = '/ktgl/kcKetangbiao/queryById',
+ getKtangInfo = '/ktgl/kcKetangbiao/queryAllDataById',
savePlayLog = '/jiaoshi/kcZhihuijiaoshiAccessLog/savePlayLog',
changeAvyLiveByJsbhsApi = '/httpinterface/runAvyApiByJsbhs',
}
@@ -289,6 +315,13 @@ function getKcxx(){
console.log(res);
ktangInfo.value = res;
kcCardBoxTitle.value = res.kcmc;
+
+ // defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh: res.rwbh,xqxn: res.xnxq } }).then((res) => {
+ // if(res){
+ // jxdgInfo.value = res;
+ // }
+ // });
+
});
}
function savePlayLogFn(item){
@@ -342,11 +375,34 @@ function openAllSuiBi(){
}).finally(() => {
//关闭等待
});
-
}
+function calcPercentage(averageNum, zrs) {
+ if(averageNum === 0 || zrs === 0){
+ return '0%';
+ }else{
+ return (averageNum / zrs * 100).toFixed(2);
+ }
+}
+
+function openPdf(miniUrl) {
+ let url2 = getFileAccessHttpUrl(miniUrl)
+ let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
+ window.open(url,"_blank");
+}
+
+function downloadFile(miniUrl) {
+ let url = getFileAccessHttpUrl(miniUrl);
+ window.open(url,"_blank");
+}
+
+
+