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

Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_vue 

# Conflicts:
#	src/views/site/renKeJiaoCheng/index.vue
This commit is contained in:
yangjun 2023-06-18 22:52:35 +08:00
parent 77de97b96b 9a66c57210
commit 695a2d21f1
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,16 +27,16 @@
<a-table :loading="loading" :data-source="leftList" :pagination="false" bordered size="middle" class="ant-table-striped" :scroll="{ y: 650 }">
<a-table-column title="教室" data-index="jsmc"/>
<a-table-column title="教师近景" align="center" data-index="child_教师全景">
<a-table-column title="教师近景" align="center" data-index="child_教师近景">
<template #default="{ record }">
<span :class="record?.child['教师全景']?.isOnLine?'green':'red'">
<span :class="record?.child['教师近景']?.isOnLine?'green':'red'">
<i class="fas fa-circle" />
</span>
</template>
</a-table-column>
<a-table-column title="教师全景" align="center" data-index="child_">
<a-table-column title="教师全景" align="center" data-index="child_教师全景">
<template #default="{ record }">
<span :class="record?.child['录播主机']?.isOnLine?'green':'red'">
<span :class="record?.child['教师全景']?.isOnLine?'green':'red'">
<i class="fas fa-circle"/>
</span>
</template>
@ -57,7 +57,7 @@
</a-table-column>
<a-table-column title="直播推流" align="center" data-index="child_直播推流">
<template #default="{ record }">
<span :class="record?.child['录播主机']?.isOnLine?'green':'red'">
<span :class="record?.child['教师全景']?.isOnLine?'green':'red'">
<i class="fas fa-circle"/>
</span>
</template>
@ -86,7 +86,7 @@
<a-table-column width="200px" title="操作" data-index="action">
<template #default="{ record }">
<a @click="ylLive(record)">预览</a> |
<a v-if="!record?.child['录播主机']?.isOnLine" @click="changeLive(record,true)">开启推流 |</a>
<a v-if="!record?.child['教师全景']?.isOnLine" @click="changeLive(record,true)">开启推流 |</a>
<a v-else @click="changeLive(record,false)">关闭推流 |</a>
<a v-if="record.sfyx == 1" @click="changeKt(record,true)">课堂上线</a>
<a v-else-if="record.sfyx == 0" @click="changeKt(record,false)">课堂下线</a>
@ -96,7 +96,7 @@
</a-table>
</div>
<a-modal :visible="isShowAllLive" width="80%" style="top: 20px" title="直播" :ok-button-props="{ style: { display: 'none' } }" cancelText="关闭" @cancel="() => (isShowAllLive = false,showAllLiveRef.close())">
<showAllLive ref="showAllLiveRef" :currentItem="currentItem"/>
<showAllLive ref="showAllLiveRef" :currentItem="currentItem" :isShowAllLive="isShowAllLive"/>
</a-modal>
</template>
<script lang="ts" setup name="zhihuijiaoshiIndexPage">

4
src/views/kc/tksf/kctkcstj/KcTkcstjList.vue
View File

@ -6,7 +6,8 @@
<a-row :gutter="24">
<a-col :lg="8">
<a-form-item label="学年学期">
<JInput placeholder="请输入学年学期" v-model:value="queryParam.xnxq"></JInput>
<!-- <JInput placeholder="请输入学年学期" v-model:value="queryParam.xnxq"></JInput> -->
<j-dict-select-tag ref="xqDictTag" placeholder="请选择学期" v-model:value="queryParam.xnxq" dictCode="kc_tkcstj,xnxq,xnxq,true GROUP BY xnxq order by xnxq desc" />
</a-form-item>
</a-col>
<a-col :lg="8">
@ -109,6 +110,7 @@
import KcTkcstjModal from './components/KcTkcstjModal.vue'
import keTangModal from './components/keTangModal.vue'
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false);

3
src/views/site/renKeJiaoCheng/index.vue
View File

@ -210,8 +210,9 @@ async function getTeacherjlrkcb() {
color: #fff;
border-radius: 5px;
line-height: 23px;
&[disabled] {
background: #7bb7de;
background: #6cafda;
}
}
.ketangCardcol{