diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index a5d91f8..284bb91 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -278,7 +278,7 @@ function createAxios(opt?: Partial) { // authentication schemes,e.g: Bearer // authenticationScheme: 'Bearer', authenticationScheme: '', - timeout: 20 * 1000, + timeout: 10 * 20 * 1000, // 基础接口地址 // baseURL: globSetting.apiUrl, headers: { 'Content-Type': ContentTypeEnum.JSON }, diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue index 4b16158..802604e 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue @@ -103,7 +103,7 @@ - + @@ -124,19 +124,20 @@ import KcZwtksfInfoListModal from '/@/views/kc/kcZwtksfInfo/KcZwtksfInfoListModal.vue'; import StaticConXyglyChartModal from '/@/views/kc/config/StaticCon/StaticConXyglyChartModal.vue'; import StaticConGlyChartModal from '/@/views/kc/config/StaticCon/StaticConGlyChartModal.vue'; - + import { useMessage } from '/@/hooks/web/useMessage'; const StaticCon = ref(); const StaticConChart = ref(); const KcZwtksfInfoList = ref(); const StaticConXyglyChart = ref(); const StaticConGlyChart = ref(); - + const queryParam = ref({}); - const roleList = computed(() => getUserInfo()?.roleList??[]); - let listglyData = ref([]); - let listxyData = ref([]); + const roleList = computed(() => getUserInfo()?.roleList??[]); + let listglyData = ref([]); + let listxyData = ref([]); + const { createMessage } = useMessage(); const tjlist = (queryParam) => defHttp.get({ url: '/config/kcExportConfigTpkwcqkjzglx/getTjlist', params:queryParam }); //进入就加载 @@ -199,7 +200,7 @@ listxyData.value.push(res[i]); } } - + }) } @@ -235,7 +236,7 @@ * 成功回调 */ function handleSuccess() { - (selectedRowKeys.value = []) && reload(); + // (selectedRowKeys.value = []) && reload(); } function onExport() { onExportWord(); diff --git a/src/views/kc/jiaoshi/index.vue b/src/views/kc/jiaoshi/index.vue index 3d0bc2d..a108892 100644 --- a/src/views/kc/jiaoshi/index.vue +++ b/src/views/kc/jiaoshi/index.vue @@ -26,7 +26,7 @@ -
+
{{ leftList.length }}
@@ -35,7 +35,7 @@
-
+
{{ getSysConfig().flag5 == 0?'否': leftList.filter(x => x.sfyx == 0).length || 0}}
@@ -73,7 +73,7 @@
-
+
{{ (leftList.filter(x => x.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0) }}
@@ -82,7 +82,7 @@
-
+
{{ (leftList.filter(x => x.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0) }}
@@ -141,13 +141,13 @@ - {{ item.child.filter(x => x?.nowIsClass).length || 0}} - {{ item.child.filter(x => x?.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0}} - {{ item.child.filter(x => x?.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0 }} + {{ item.child.filter(x => x?.nowIsClass).length || 0}} + {{ item.child.filter(x => x?.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0}} + {{ item.child.filter(x => x?.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0 }} - 正在上课 - 正在直播 - 直播异常 + 正在上课 + 正在直播 + 直播异常 @@ -188,7 +188,7 @@ @@ -196,7 +196,7 @@ @@ -211,7 +211,7 @@ @@ -219,7 +219,7 @@ @@ -227,7 +227,7 @@ diff --git a/src/views/kc/jiaoshi/indexDetail.vue b/src/views/kc/jiaoshi/indexDetail.vue index adaa6a5..ab66111 100644 --- a/src/views/kc/jiaoshi/indexDetail.vue +++ b/src/views/kc/jiaoshi/indexDetail.vue @@ -35,7 +35,7 @@ - + 请选择 正常 部分正常 @@ -237,6 +237,11 @@ const ipagination = ref( ); function open(param){ + + console.log(`🚀 -----------------------------------------------------🚀`); + console.log(`🚀 ~ file: indexDetail.vue:241 ~ open ~ param:`, param); + console.log(`🚀 -----------------------------------------------------🚀`); + changeQueryParam(param); isShowPage.value = true; } @@ -509,7 +514,15 @@ function filterDataSource() { if(isReturn) isReturn = x.zbgn == qw.zbgn; } if(qw.onLineClassType){ - if(isReturn) isReturn = x.onLineClassType == qw.onLineClassType; + if(typeof qw.onLineClassType == 'object'){ + let r = false; + qw.onLineClassType.forEach(v => { + if(!r) r = v == x.onLineClassType; + }); + if(isReturn) isReturn = r; + }else{ + if(isReturn) isReturn = x.onLineClassType == qw.onLineClassType; + } } if(qw.nowIsClass != undefined){ if(qw.nowIsClass == true){