yangjun
/
dbsd_kczx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年12月12日 修复问题

This commit is contained in:
bai 2023-12-12 10:27:58 +08:00
parent 42c49d9d8c
commit 001f1ac4d5
4 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/http/axios/index.ts
View File

@ -278,7 +278,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
// authentication schemes，e.g: Bearer
// authenticationScheme: 'Bearer',
authenticationScheme: '',
timeout: 20 * 1000,
timeout: 10 * 20 * 1000,
// 基础接口地址
// baseURL: globSetting.apiUrl,
headers: { 'Content-Type': ContentTypeEnum.JSON },

17
src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue
View File

@ -103,7 +103,7 @@
</a-col>
</a-row>
</div>
<StaticConModal ref="StaticCon"/>
<StaticConModal ref="StaticCon"/>
<StaticConChartModal ref="StaticConChart"/>
<KcZwtksfInfoListModal ref="KcZwtksfInfoList"/>
<StaticConXyglyChartModal ref="StaticConXyglyChart"/>
@ -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<any>({});
const roleList = computed(() => getUserInfo()?.roleList??[]);
let listglyData = ref<any>([]);
let listxyData = ref<any>([]);
const roleList = computed(() => getUserInfo()?.roleList??[]);
let listglyData = ref<any>([]);
let listxyData = ref<any>([]);
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();

30
src/views/kc/jiaoshi/index.vue
View File

@ -26,7 +26,7 @@
</div>
</a-col>
<a-col :span="6">
<div class="numberBlob handleCss" @click="openDetail({ sfyx: '0' })">
<div class="numberBlob handleCss" @click="openDetail({})">
<div class="numSpan blue">{{ leftList.length }}</div>
<div class="numberName">
<!-- <RiseOutlined class="orange"/> -->
@ -35,7 +35,7 @@
</div>
</a-col>
<a-col :span="6">
<div class="numberBlob handleCss" @click="openDetail({ sfyx2: '0' })">
<div class="numberBlob handleCss" @click="openDetail({ sfyx: '0' })">
<div class="numSpan orange">{{ getSysConfig().flag5 == 0?'否': leftList.filter(x => x.sfyx == 0).length || 0}}</div>
<div class="numberName">
<!-- <RiseOutlined class="orange"/> -->
@ -73,7 +73,7 @@
</div>
</a-col>
<a-col :span="8">
<div class="numberBlob handleCss" @click="openDetail({ onLineClassType: 'green' })">
<div class="numberBlob handleCss" @click="openDetail({ nowIsClass: true, onLineClassType: ['green', 'yellow'] })">
<div class="numSpan blue">{{ (leftList.filter(x => x.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0) }}</div>
<div class="numberName">
<!-- <RiseOutlined class="orange"/> -->
@ -82,7 +82,7 @@
</div>
</a-col>
<a-col :span="8">
<div class="numberBlob handleCss" @click="openDetail({ onLineClassType: 'red' })">
<div class="numberBlob handleCss" @click="openDetail({ nowIsClass: true, onLineClassType: 'red' })">
<div class="numSpan orange">{{ (leftList.filter(x => x.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0) }}</div>
<div class="numberName">
<!-- <RiseOutlined class="orange"/> -->
@ -141,13 +141,13 @@
</a-row>
<a-row style="text-align: center;">
<a-col class="hover" :span="8" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true})"><span>{{ item.child.filter(x => x?.nowIsClass).length || 0}}</span></a-col>
<a-col class="hover" :span="8" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, onLineClassType: 'green'})"><span>{{ item.child.filter(x => x?.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0}}</span></a-col>
<a-col class="hover" :span="8" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, onLineClassType: 'red'})"><span>{{ item.child.filter(x => x?.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0 }}</span></a-col>
<a-col class="hover" :span="8" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true })"><span>{{ item.child.filter(x => x?.nowIsClass).length || 0}}</span></a-col>
<a-col class="hover" :span="8" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true, onLineClassType: 'green' })"><span>{{ item.child.filter(x => x?.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0}}</span></a-col>
<a-col class="hover" :span="8" style="font-weight: 600;" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true, onLineClassType: 'red' })"><span>{{ item.child.filter(x => x?.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0 }}</span></a-col>
<!-- <a-col :span="8" style="font-weight: 600;" >&nbsp;</a-col> -->
<a-col class="hover" :span="8" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true})"><span>正在上课</span></a-col>
<a-col class="hover" :span="8" @click="openDetail({ jxlName: item.jxlName, onLineClassType: 'green'})"><span>正在直播</span></a-col>
<a-col class="hover" :span="8" @click="openDetail({ jxlName: item.jxlName, onLineClassType: 'red'})"><span>直播异常</span></a-col>
<a-col class="hover" :span="8" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true })"><span>正在上课</span></a-col>
<a-col class="hover" :span="8" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true, onLineClassType: 'green' })"><span>正在直播</span></a-col>
<a-col class="hover" :span="8" @click="openDetail({ jxlName: item.jxlName, nowIsClass: true, onLineClassType: 'red' })"><span>直播异常</span></a-col>
<!-- <a-col :span="8" >&nbsp;</a-col> -->
</a-row>
</a-card>
@ -188,7 +188,7 @@
<a-table-column title="可直播" data-index="_">
<template #default="{ record }">
<span @click="openDetail({ jxlName: record.jxlName, sfyx: '0' })">
<span @click="openDetail({ jxlName: record.jxlName })">
{{ record.child.length }}
</span>
</template>
@ -196,7 +196,7 @@
<a-table-column title="开放听课" data-index="_">
<template #default="{ record }">
<span @click="openDetail({ jxlName: record.jxlName })">
<span @click="openDetail({ jxlName: record.jxlName, sfyx: '0' })">
{{ record.child.filter(x => x.sfyx == 0).length || 0 }}
</span>
</template>
@ -211,7 +211,7 @@
<a-table-column title="正在上课" data-index="_">
<template #default="{ record }">
<span @click="openDetail({ jxlName: record.jxlName, nowIsClass: true})">
<span @click="openDetail({ jxlName: record.jxlName, nowIsClass: true })">
{{ record.child.filter(x => x?.nowIsClass).length || 0}}
</span>
</template>
@ -219,7 +219,7 @@
<a-table-column title="正在直播" data-index="_">
<template #default="{ record }">
<span @click="openDetail({ jxlName: record.jxlName, onLineClassType: 'green'})">
<span @click="openDetail({ jxlName: record.jxlName, nowIsClass: true, onLineClassType: 'green' })">
{{ record.child.filter(x => x?.nowIsClass && x?.child['教师近景']?.isOnLine).length || 0}}
</span>
</template>
@ -227,7 +227,7 @@
<a-table-column title="直播异常" data-index="_">
<template #default="{ record }">
<span @click="openDetail({ jxlName: record.jxlName, onLineClassType: 'red'})">
<span @click="openDetail({ jxlName: record.jxlName, nowIsClass: true, onLineClassType: 'red' })">
{{ record.child.filter(x => x?.nowIsClass && !x?.child['教师近景']?.isOnLine).length || 0 }}
</span>
</template>

17
src/views/kc/jiaoshi/indexDetail.vue
View File

@ -35,7 +35,7 @@
</a-col>
<a-col :lg="6">
<a-form-item label="直播状态">
<a-select placeholder="请选择" v-model:value="queryParam.onLineClassType">
<a-select mode="multiple" placeholder="请选择" v-model:value="queryParam.onLineClassType">
<a-select-option :value="undefined">请选择</a-select-option>
<a-select-option value="green">正常</a-select-option>
<a-select-option value="yellow">部分正常</a-select-option>
@ -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){