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

2023年6月7日 修复问题

This commit is contained in:
bai 2023-06-07 00:02:49 +08:00
parent 44cc5732ac
commit 97cd077efb
8 changed files with 117 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/views/site/common/header.vue
View File

@ -13,41 +13,42 @@
意见反馈
</div>
</a-col>
<a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
<a-menu style="margin-top: 20px;" :selectable="false">
<a-menu-item key="1">
<a class="abox" @click="toDom('tkzjDom')">听课足迹</a>
</a-menu-item>
<a-menu-item key="2">
<a class="abox" @click="toDom('rkjcDom')">任教课程</a>
</a-menu-item>
<a-menu-item key="3">
<a class="abox" @click="toDom('yykcDom')">预约课程</a>
</a-menu-item>
<a-menu-item key="4">
<a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a>
</a-menu-item>
<a-menu-item key="5">
<a class="abox" @click="toDom('kxstkktDom')">线上听课</a>
</a-menu-item>
<a-menu-item key="6">
<a class="abox" @click="toDom('jrkclbDom')">今日课程</a>
</a-menu-item>
</a-menu>
<!-- <div style="background-color: #fff;">
<div>&nbsp;</div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('tkzjDom')">听课足迹</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('rkjcDom')">任教课程</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('yykcDom')">预约课程</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('kxstkktDom')">线上听课</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('jrkclbDom')">今日课程</a></div>
</div> -->
</a-col>
<!-- <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
</a-col> -->
</a-row>
</div>
<div id="leftDiv" v-show="props.showRightButton">
<a-menu style="margin-top: 20px;" :selectable="false">
<a-menu-item key="1">
<a class="abox" @click="toDom('tkzjDom')">听课足迹</a>
</a-menu-item>
<a-menu-item key="2">
<a class="abox" @click="toDom('rkjcDom')">任教课程</a>
</a-menu-item>
<a-menu-item key="3">
<a class="abox" @click="toDom('yykcDom')">预约课程</a>
</a-menu-item>
<a-menu-item key="4">
<a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a>
</a-menu-item>
<a-menu-item key="5">
<a class="abox" @click="toDom('kxstkktDom')">线上听课</a>
</a-menu-item>
<a-menu-item key="6">
<a class="abox" @click="toDom('jrkclbDom')">今日课程</a>
</a-menu-item>
</a-menu>
<!-- <div style="background-color: #fff;">
<div>&nbsp;</div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('tkzjDom')">听课足迹</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('rkjcDom')">任教课程</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('yykcDom')">预约课程</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('jcgkkDom')">公&nbsp;&nbsp;开&nbsp;&nbsp;课</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('kxstkktDom')">线上听课</a></div>
<div class="topLinkTextEllipsis"><a class="abox" @click="toDom('jrkclbDom')">今日课程</a></div>
</div> -->
</div>
<span class="topTitle" >
<RouterLink :to="{path:'/site/index'}" style="color:white;">{{ projectName }}</RouterLink>
<RouterLink hidden target='_blank' :to="{path:'/site/liveView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页rtsp</RouterLink>
@ -184,6 +185,13 @@ function toIndex(){
// color: black;
}
}
#leftDiv {
position: absolute;
left: 1rem;
top: 5rem;
z-index: 1;
width: 100px;
}

2
src/views/site/common/video/videojs/video.vue
View File

@ -82,6 +82,7 @@ function init(){
// console.log('videojs ->',videojs);
// let buttonList:Array<String> = [];
let currentSources:any = playerMain.currentSources();
// currentSources?.forEach(x => {
@ -92,6 +93,7 @@ function init(){
let _playerMain: any = playerMain;
let _videojs: any = videojs;
_playerMain.controlBar.addChild('Button', {
text: '选择清晰度',
el: _videojs.createEl('button', {

1
src/views/site/common/video/videojs/viewPage.vue
View File

@ -234,6 +234,7 @@ function openAllSuiBi(){
ketangbiaoId: route.query.ktId,
column: 'createTime',
order: 'desc',
pageSize: '-1',
};
querySuibi(param).then(res => {
// model = (res.records??[{}])[0];

34
src/views/site/jrkclb/kclbList.vue
View File

@ -52,11 +52,17 @@
</a-col>
<!-- <a-col :span="24" style="text-align: center;"> -->
<a-col :span="24" v-else style="text-align: center;">
<div v-show="isNow(item)">
<a-button type="primary" class="yyyClass" disabled v-if="item.sfyy==1 && item.isdeleted==0">已预约</a-button>
<a-button type="primary" class="yyClass" @click="funYuyue(item)" v-if="item.sfyy==0 || (item.sfyy==1 && item.isdeleted==1)">预约</a-button>
</div>
<div v-show="!isNow(item)">
<span v-if="props.type == 'zzsk'">
<!-- 正在上课的，就给个评价 -->
<a-button type="primary" class="bcClass" @click="funpingjia(item)" >评价</a-button>
</span>
<span v-else>
<a-button type="primary" class="yyyClass" disabled v-if="item.sfyy==1 && item.isdeleted==0">已预约</a-button>
<a-button type="primary" class="yyClass" @click="funYuyue(item)" v-if="item.sfyy==0 || (item.sfyy==1 && item.isdeleted==1)">预约</a-button>
</span>
</div>
<div v-show="isNow(item)">
<a-button type="primary" class="bcClass" @click="funpingjia(item)" >评价</a-button>
</div>
<!-- <a-col :span="24"> -->
@ -99,8 +105,9 @@ let listData = ref<any>([]);
let listType = ref<any>(String);
const list = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getKclblist', params });
const props = defineProps({
queryParam:{type:Object}
});
queryParam:{ type:Object },
type: { type: String },
});
//监听条件变化
watch(() => props.queryParam, async (newRow, oldRow) => {
@ -145,8 +152,19 @@ async function funYuyue(record){
function isNow(item){
const jssj = dayjs(item.skrq + " " +item.jssj, 'YYYY-MM-DD hh:mm:ss');
const dqsj = dayjs(new Date(), 'YYYY-MM-DD hh:mm:ss');
if(jssj<dqsj){
const dqsj = dayjs(new Date());
if(jssj.unix() < dqsj.unix()){
console.log(`🚀 -------------------------------------------------🚀`);
console.log(`🚀 ~ file: kclbList.vue:149 ~ isNow ~ jssj:`, jssj,item,item.skrq,item.jssj,dayjs);
console.log(`🚀 -------------------------------------------------🚀`);
console.log(`🚀 -------------------------------------------------🚀`);
console.log(`🚀 ~ file: kclbList.vue:155 ~ isNow ~ dqsj:`, dqsj, jssj<dqsj);
console.log(`🚀 -------------------------------------------------🚀`);
return true;
}else{
return false;

32
src/views/site/tingKeZuJi/index.vue
View File

@ -7,9 +7,11 @@
<!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> -->
</template>
<template #extra>
<RouterLink target='_blank' to="/site/tingKeZuJiMore">查看更多</RouterLink>
<!-- <RouterLink target='_blank' to="/site/tingKeZuJiMore">查看更多</RouterLink> -->
<a style="padding-right: 0.5rem;" @click="reloadTkzj()">刷新</a>
<RouterLink to="/site/tingKeZuJiMore">查看更多</RouterLink>
</template>
<listPage :queryParam="{ pageSize: 5 }"/>
<listPage :queryParam="{ pageSize: 5, ...tkzjParam }"/>
</a-card>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 12 }" style="padding: 0 0 0 2px;">
@ -19,19 +21,37 @@
<!-- <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="addPingJia">新增评价</a></span> -->
</template>
<template #extra>
<RouterLink target='_blank' to="/site/tingKeZuJiMore">查看更多</RouterLink>
<a style="padding-right: 0.5rem;" @click="reloadPkzj()">刷新</a>
<RouterLink to="/site/tingKeZuJiMore">查看更多</RouterLink>
</template>
<listPkzjPage :queryParam="{ pageSize: 5 ,score:'1'}"/>
<listPkzjPage :queryParam="{ pageSize: 5 ,score:'1', ...pkzjParam }"/>
</a-card>
</a-col>
</a-row>
</template>
<script setup lang="ts">
import { ref } from 'vue';
import listPage from '/@/views/site/tingKeZuJi/list.vue';
import listPkzjPage from '/@/views/site/tingKeZuJi/listPkzj.vue';
import { nextTick } from 'vue';
function addPingJia(){
//新增评价
const tkzjParam = ref({});
const pkzjParam = ref({});
function reloadTkzj(){
console.log('1');
tkzjParam.value = { isReload: true };
// nextTick(() => {
// tkzjParam.value = { isReload: false };
// });
}
function reloadPkzj(){
pkzjParam.value = { isReload: true };
// nextTick(() => {
// pkzjParam.value = { isReload: false };
// });
}
</script>
<style lang="less" scoped>

13
src/views/site/tingKeZuJi/list.vue
View File

@ -22,7 +22,7 @@
查看听课笔记
</a-popover>
</span>
<span v-if="item.bh" style="color: #337ab7;margin-left: 30px;" @click="fwdtModal.view(item)"><FormOutlined/>服务大厅</span>
<span v-if="item.bh" style="color: #337ab7;margin-left: 30px;" @click="fwdtModal.view(item)"><FormOutlined/>服务大厅</span>
</div>
</template>
<template #avatar>
@ -42,7 +42,7 @@
<fwdtModalPage ref="fwdtModal"/>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import { ref, onMounted, watch } from 'vue';
import { TeamOutlined, FormOutlined } from '@ant-design/icons-vue';
import { getUserId,getSysConfig } from '/@/views/site/utils/index';
@ -62,7 +62,6 @@ const props = defineProps({
queryParam: { type: Object, default: () => ({}) },
});
/**
* 列表接口
* @param params
@ -74,6 +73,14 @@ onMounted(() => {
init();
});
watch(
() => props.queryParam,
(v) => {
init();
}
);
function init() {
console.log('init');
listApi({ userid: getUserId(), tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => {

12
src/views/site/tingKeZuJi/listPkzj.vue
View File

@ -13,7 +13,7 @@
<!-- -{{ item }}- -->
<div class="wenZiJiaCu">
<span v-if="item.score" class="hand" style="color: #337ab7;" @click="viewModal.view(item)">已评分：{{ item.score }}分</span>
<span v-if="item.source != null" class="hand" style="padding-left: .5rem;color: #337ab7;">【</span>
<span v-if="item.source=='0'" class="hand" style="padding-left: .5rem;color: #337ab7;">课程中心</span>
<span v-else-if="item.source=='1'" class="hand" style="padding-left: .5rem;color: #337ab7;">老系统</span>
@ -44,7 +44,7 @@
<fwdtModalPage ref="fwdtModal"/>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue';
import { ref, onMounted, watch } from 'vue';
import { TeamOutlined, FormOutlined } from '@ant-design/icons-vue';
import { getUserId,getSysConfig } from '/@/views/site/utils/index';
@ -76,6 +76,14 @@ onMounted(() => {
init();
});
watch(
() => props.queryParam,
(v) => {
init();
}
);
function init() {
console.log('init');
listApi({ userid: getUserId(),pj:'1', tingketime: getSysConfig().bxqkssj, ...props.queryParam }).then(res => {

2
src/views/site/tingKeZuJi/page/qaAddPage.vue
View File

@ -18,7 +18,7 @@
<!-- 学院名，课程名，授课教师 -->
{{ form.kcmc }}-{{ form.kkdw }}-{{ form.skjs }}
<div style="padding: 0.5rem;">
{{ form.skrq }}-{{ form.hh }}-{{ form.skdd }}
{{ form.skrq }}&nbsp;{{ form.hh }}&nbsp;{{ form.skdd }}
</div>
<!-- kcmc,kkdw,skjs -->
</div>