修改bug

This commit is contained in:
yangjun 2023-07-26 08:48:37 +08:00
parent 485b6d831d
commit 8b485b6a22
6 changed files with 102 additions and 11 deletions

View File

@ -67,7 +67,7 @@
<span class="topTitle" > <span class="topTitle" >
<RouterLink :to="{path:'/site/index'}" style="color:white;">{{ projectName }} <RouterLink :to="{path:'/site/index'}" style="color:white;">{{ projectName }}
<span style="font-size: 16px;" v-if="getSysConfig().flag1">{{getSysConfig().flag1}}({{getSysConfig().bxqkssj}}{{getSysConfig().bxqjssj}})</span> <span style="font-size: 16px;" v-if="getSysConfig().flag1">{{getSysConfig().flag1}}({{getSysConfig().bxqkssj}}{{getSysConfig().bxqjssj}})</span>
<span style="font-size: 16px;margin-left: 20px;" >本学期听课要求{{tkyqcs}}已完成{{tkyqywc}}</span> <span style="font-size: 16px;margin-left: 20px;" >本学期听课要求{{tkyqcs}}<span v-if="tkyqcs!='未配置'"></span>已完成{{tkyqywc}}</span>
</RouterLink> </RouterLink>
<RouterLink hidden target='_blank' :to="{path:'/site/liveView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页rtsp</RouterLink> <RouterLink hidden target='_blank' :to="{path:'/site/liveView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页rtsp</RouterLink>
<RouterLink hidden target='_blank' :to="{path:'/site/liveFlvView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页flv</RouterLink> <RouterLink hidden target='_blank' :to="{path:'/site/liveFlvView',query:{ url: 'rtsp://176.139.87.16/axis-media/media.amp' }}">直播测试页flv</RouterLink>

View File

@ -4,6 +4,31 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{
title: '课程名称',
align: "center",
dataIndex: 'kcmc'
},
{
title: '授课教师',
align: "center",
dataIndex: 'skjs'
},
{
title: '授课地点',
align: "center",
dataIndex: 'skdd'
},
{
title: '授课时间',
align: "center",
dataIndex: 'skrq'
},
{
title: '节次',
align: "center",
dataIndex: 'hh'
},
{ {
title: '创建时间', title: '创建时间',
align: "center", align: "center",

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="renKeJiaoChengBase"> <div class="renKeJiaoChengBase" >
<a-modal :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" :getContainer="getPDom" cancelText="关闭"> <a-modal :width="width" :visible="visible" @ok="handleOk" z-index="1001" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" :getContainer="getPDom" cancelText="关闭" style="z-index: 9999;">
<template #title> <template #title>
<div style="text-align: center;font-size: 1.5rem;">请选择评价表</div> <div style="text-align: center;font-size: 1.5rem;">请选择评价表</div>
</template> </template>

View File

@ -4,7 +4,7 @@
<a-row style="margin-top:20px;"> <a-row style="margin-top:20px;">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-form-item label="" style="padding: 10px;"> <a-form-item label="" style="padding: 10px;">
<a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker> <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择授课日期'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@ -75,7 +75,7 @@ const queryParam = ref<any>({});
dataIndex: 'kcmc', dataIndex: 'kcmc',
}, },
{ {
title: '课教师', title: '课教师',
align: 'center', align: 'center',
dataIndex: 'skjs', dataIndex: 'skjs',
}, },
@ -85,7 +85,7 @@ const queryParam = ref<any>({});
dataIndex: 'hh', dataIndex: 'hh',
}, },
{ {
title: '课地点', title: '课地点',
align: 'center', align: 'center',
dataIndex: 'skdd', dataIndex: 'skdd',
}, },
@ -99,6 +99,11 @@ const queryParam = ref<any>({});
align: 'center', align: 'center',
dataIndex: 'skrq', dataIndex: 'skrq',
}, },
{
title: '听课人',
align: 'center',
dataIndex: 'username',
},
]); ]);
const dataSource: any = ref([]); const dataSource: any = ref([]);

View File

@ -4,7 +4,7 @@
<a-row style="margin-top:20px;"> <a-row style="margin-top:20px;">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-form-item label="" style="padding: 10px;"> <a-form-item label="" style="padding: 10px;">
<a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker> <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择授课日期'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }"> <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@ -37,16 +37,34 @@
:pagination="ipagination" :pagination="ipagination"
@change="tableChange" @change="tableChange"
> >
<template #action="{ record }">
<a href="javascript:void(0)" @click="txpjFun(record)">评价</a>
</template>
</a-table> </a-table>
</a-modal> </a-modal>
<addModalPage ref="tingKeZuJiAddModal"/>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, defineExpose } from 'vue'; import { ref, defineExpose, createVNode,h } from 'vue';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import { dateUtil, formatToDate } from '/@/utils/dateUtil'; import { dateUtil, formatToDate } from '/@/utils/dateUtil';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
import { getUserId } from '/@/views/site/utils/index';
import { Modal } from 'ant-design-vue';
import { CloseOutlined } from '@ant-design/icons-vue';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
enum Api {
list = '/kcTingke/kcTingke/indexListPage',
listTkjl = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
}
const tingKeZuJiAddModal = ref();
const listTkjlApi = (params) => defHttp.get({ url: Api.listTkjl, params });
const ipagination:any = ref({ const ipagination:any = ref({
current: 1, current: 1,
pageSize: 10, pageSize: 10,
@ -75,7 +93,7 @@ const queryParam = ref<any>({});
dataIndex: 'kcmc', dataIndex: 'kcmc',
}, },
{ {
title: '课教师', title: '课教师',
align: 'center', align: 'center',
dataIndex: 'skjs', dataIndex: 'skjs',
}, },
@ -85,7 +103,7 @@ const queryParam = ref<any>({});
dataIndex: 'hh', dataIndex: 'hh',
}, },
{ {
title: '课地点', title: '课地点',
align: 'center', align: 'center',
dataIndex: 'skdd', dataIndex: 'skdd',
}, },
@ -99,6 +117,17 @@ const queryParam = ref<any>({});
align: 'center', align: 'center',
dataIndex: 'skrq', dataIndex: 'skrq',
}, },
{
title: '评课分数',
align: 'center',
dataIndex: 'score',
},
{
title: '操作',
align: 'center',
dataIndex: 'action',
slots: { customRender: 'action' },
},
]); ]);
const dataSource: any = ref([]); const dataSource: any = ref([]);
@ -119,6 +148,38 @@ const queryParam = ref<any>({});
loadData(); loadData();
} }
function txpjFun(item){
console.log(`🚀 ~ file: ykktzs.vue:147 ~ txpjFun ~ item:`, item)
item.ketangbiaoid = item.id;
let ketangbiaoid = item.id;
let userid = getUserId();
listTkjlApi({ userid: userid, ketangbiaoid:ketangbiaoid}).then(res => {
var list = res
console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list)
if(list.length>0){
var score = list[0].score
if(score){
Modal.error({
icon: createVNode({}),
content: h('div', {style:'height:200px;text-align:center;'}, [
h('icon', {style:'font-size:80px;font-weight:600;color:red;'}, createVNode(CloseOutlined)),
h('p',{style:'font-size:22px;font-weight:600;color:black;'}, '已经对此课程进行评价,不可重复评价,请点击刷新按钮!'),
]),
okText: 'OK',
width:'500px',
});
}else{
tingKeZuJiAddModal.value.view(item)
}
}else{
tingKeZuJiAddModal.value.view(item)
}
});
}
function loadData(){ function loadData(){
let skrq = formatToDate(new Date()); let skrq = formatToDate(new Date());
let { current:pageNo, pageSize } = ipagination.value; let { current:pageNo, pageSize } = ipagination.value;

View File

@ -8,7 +8,7 @@
<span class="titleDownload"> <span class="titleDownload">
<a-tooltip placement="topLeft"> <a-tooltip placement="topLeft">
<template #title> <template #title>
<span>登录教师课程可以预约听课完成后可以对课程进行评价评价有助于快速完成本学期的听课任务</span> <span>登录教师可以预约课程听课完成后可以对课程进行评价评价有助于快速完成本学期的听课任务</span>
</template> </template>
<span class="helpClass">?</span> <span class="helpClass">?</span>
</a-tooltip></span> </a-tooltip></span>