修改bug

This commit is contained in:
yangjun 2024-03-06 21:25:42 +08:00
parent b703a2a270
commit e9886c41d9
8 changed files with 146 additions and 70 deletions

View File

@ -204,7 +204,7 @@
</template>
</a-table-column>
<a-table-column title="设备异常2" data-index="_">
<a-table-column title="设备异常" data-index="_">
<template #default="{ record }">
<span v-if="!statusLogList.length">未检测</span>
<span v-else>{{ statusLogList.filter(x => x.jxlName == record.jxlName && x.type != 'green' ).length }}</span>
@ -564,7 +564,7 @@ const isShowAllLive:Ref<boolean> = ref(false);
const loading:Ref<boolean> = ref(false);
const btnLoading:Ref<boolean> = ref(false);
const twoShowType:Ref<boolean> = ref(true);
const { createMessage, createInfoModal, createErrorModal } = useMessage();
const { createMessage, createInfoModal, createErrorModal,createConfirm } = useMessage();
const route = useRouter();
const queryParam:Ref<any> = ref({
zbgn: '0'
@ -856,21 +856,33 @@ function getJsjbxxList(){
}
function refreshLogsFn(jxlName?){
//createInfoModal({ title: '',content: '3~5' });
if(jxlName){
btnStatus.value[jxlName] = true;
btnStatus.value.all = true;
}else{
btnStatus.value.all = true;
}
refreshLogs({ jxlName }).then(res => {
let list = (res?.records) ?? (res) ?? [];
// console.log(`🚀 ----------------------------------------------------------🚀`);
// console.log(`🚀 ~ file: index.vue:539 ~ refreshLogsFn ~ list:`, list);
// console.log(`🚀 ----------------------------------------------------------🚀`);
statusLogList.value = list;
getJianceBtnStatus();
})
createConfirm({
iconType: 'warning',
title: '是否检测',
content: '是否确认检测当前全体教室状态?',
okText: '确认',
cancelText: '取消',
onOk: () => {
//createInfoModal({ title: '',content: '3~5' });
if(jxlName){
btnStatus.value[jxlName] = true;
btnStatus.value.all = true;
}else{
btnStatus.value.all = true;
}
refreshLogs({ jxlName }).then(res => {
let list = (res?.records) ?? (res) ?? [];
// console.log(`🚀 ----------------------------------------------------------🚀`);
// console.log(`🚀 ~ file: index.vue:539 ~ refreshLogsFn ~ list:`, list);
// console.log(`🚀 ----------------------------------------------------------🚀`);
statusLogList.value = list;
getJianceBtnStatus();
})
}
});
}

View File

@ -72,27 +72,27 @@ export const columns = <JVxeColumn[]>([
key: 'xf'
},
{
title: '是否出镜',
key: 'sfcj',
type: JVxeTypes.selectSearch,
width: 100,
options: [
{ label: '是', value: 0, },
{ label: '否', value: 1, },
],
},
{
title: '上课形式',
key: 'skxs',
type: JVxeTypes.selectSearch,
width: 100,
options: [
{ label: '线上', value: 0, },
{ label: '线下', value: 1, },
{ label: '线上线下混合', value: 2, },
],
},
// {
// title: '是否出镜',
// key: 'sfcj',
// type: JVxeTypes.selectSearch,
// width: 100,
// options: [
// { label: '是', value: 0, },
// { label: '否', value: 1, },
// ],
// },
// {
// title: '上课形式',
// key: 'skxs',
// type: JVxeTypes.selectSearch,
// width: 100,
// options: [
// { label: '线上', value: 0, },
// { label: '线下', value: 1, },
// { label: '线上线下混合', value: 2, },
// ],
// },
]);

View File

@ -101,6 +101,7 @@
import { JVxeTableInstance } from '/@/components/jeecg/JVxeTable/types';
import { filterObj } from '/@/utils/common/compUtils';
import { getUserSf,getSysConfig } from '/@/views/site/utils/index';
//-----------------------------------------------------------------------------------------------------------------
@ -124,7 +125,7 @@
});
const queryParam = ref<any>({ });
const filterInfo = ref<any>({ xqxn: '2023秋' });
const filterInfo = ref<any>({ xqxn: getSysConfig().flag1 });
const registerModal = ref();
const labelCol = reactive({ xs: { span: 24 }, sm: { span: 7 }, });

View File

@ -35,27 +35,32 @@ export const columns: BasicColumn[] = [
dataIndex: 'week_dictText'
},
{
title: '直播方式',
title: '是否停课',
align: "center",
dataIndex: 'zbfs_dictText'
},
{
title: '会议号',
align: "center",
dataIndex: 'hyh'
},
{
title: '会议密码',
align: "center",
dataIndex: 'hymm'
},
{
title: '课程链接',
align: "center",
dataIndex: 'kclj',
slots: { customRender: 'toUrl' },
dataIndex: 'skxs_dictText'
},
// {
// title: '直播方式',
// align: "center",
// dataIndex: 'zbfs_dictText'
// },
// {
// title: '会议号',
// align: "center",
// dataIndex: 'hyh'
// },
// {
// title: '会议密码',
// align: "center",
// dataIndex: 'hymm'
// },
// {
// title: '课程链接',
// align: "center",
// dataIndex: 'kclj',
// slots: { customRender: 'toUrl' },
// },
// {
// title: '开课周次',
// align: "center",
// dataIndex: 'kkzc_dictText'

View File

@ -40,12 +40,13 @@
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="danger" @click="batchHandleDelete" preIcon="ant-design:delete-outlined">删除</a-button>
<a-button type="primary" @click="handleEditPtxx" preIcon="ant-design:plus-outlined"> 修改平台信息</a-button>
<a-button type="primary" @click="handleEditTeacher" preIcon="ant-design:plus-outlined"> 修改教师</a-button>
<!-- <a-button type="primary" @click="handleEditPtxx" preIcon="ant-design:plus-outlined"> 修改平台信息</a-button> -->
<a-button type="primary" @click="handleEditTk" preIcon="ant-design:plus-outlined"> 修改停课状态</a-button>
<!-- <a-button type="primary" @click="handleEditTeacher" preIcon="ant-design:plus-outlined"> 修改教师</a-button> -->
<a-button type="primary" @click="handlePjb(2)" preIcon="ant-design:plus-outlined"> 线上课堂评价表</a-button>
<!-- <a-button type="primary" @click="handlePjb(2)" preIcon="ant-design:plus-outlined"> 线上课堂评价表</a-button>
<a-button type="primary" @click="handlePjb(3)" preIcon="ant-design:plus-outlined"> 听课记录表</a-button>
<a-button type="primary" @click="handlePjb(4)" preIcon="ant-design:plus-outlined"> 同行评价表</a-button>
<a-button type="primary" @click="handlePjb(4)" preIcon="ant-design:plus-outlined"> 同行评价表</a-button> -->
<!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">
@ -95,7 +96,8 @@
</template>
<script lang="ts" name="ktgl-kcKetangbiao" setup>
import { ref, reactive, watch } from 'vue';
import { ref, reactive, watch } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { useMessage } from '/@/hooks/web/useMessage';
@ -107,7 +109,7 @@
const queryParam = ref<any>({kechengbiaoid: '-1'});
const toggleSearchStatus = ref<boolean>(false);
const { createMessage } = useMessage();
const { createMessage,createConfirm } = useMessage();
const registerModal = ref();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@ -199,6 +201,40 @@
}
/**
* 修改停课状态
*/
function handleEditTk(){
let record = selectedRows.value[0];
console.log(`🚀 ~ handleEditTk ~ record:`, record)
if(!record){
createMessage.error('请您至少选择一条记录进行操作。');
return;
}
// registerModal.value.disableSubmit = false;
// registerModal.value.type = 'pt';
// registerModal.value.edit(record);
var id = record.id;
console.log(`🚀 ~ handleEditTk ~ id:`, id)
createConfirm({
iconType: 'warning',
title: '确认停课',
content: '是否将此课程停课?',
okText: '确认',
cancelText: '取消',
onOk: () => {
var url = "/ktgl/kcKetangbiao/edit";
var params = {id,sftk:0,skxs:0}
defHttp.post({url, params}).then(() => {
reload();
});
}
});
}
/**
* 修改教师
*/

View File

@ -2,32 +2,37 @@
<div>
<div style="color:#1c84c6;font-weight: 600;font-size: 16px;">以下是 <span>{{queryParam.ywTime}}</span>全天 的课表</div>
<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: 6 }">
<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-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 3 }">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="选择节次" v-model:value="queryParam.jieci" :dictCode="`kc_jieci_view,jieciname,jieci`" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="请选择课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="请选择楼宇" v-model:value="queryParam.jzwh" :dictCode="`jxl_now_view,jzwmc,jzwh,true order by sort asc`" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="是否线上课" v-model:value="queryParam.zhjs" dictCode="yn" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 6 }">
<a-form-item label="" style="padding: 10px;">
<a-input-search placeholder="课程或教师名称" v-model:value="queryParam.ywmc" enter-button="查询" @search="zbLoadData"></a-input-search>
</a-form-item>
@ -88,6 +93,7 @@ function zbLoadData() {
xxkcqueryParam.value.kcxz = queryParam.value.kcxz
xxkcqueryParam.value.skxs = '1'
xxkcqueryParam.value.jzwh = queryParam.value.jzwh
xxkcqueryParam.value.zhjs = queryParam.value.zhjs
//-----------------------------------------
txhyqueryParam.value.skrq = queryParam.value.ywTime
@ -99,6 +105,7 @@ function zbLoadData() {
txhyqueryParam.value.kcxz = queryParam.value.kcxz
txhyqueryParam.value.zbpx ='1'
txhyqueryParam.value.ywskxs = '1'
txhyqueryParam.value.zhjs = queryParam.value.zhjs
zibiaoCard(1);
}

View File

@ -19,6 +19,11 @@
<a-input placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc"></a-input>
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="是否线上课" v-model:value="queryParam.zhjs" dictCode="yn" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" style="padding: 10px;">
<a-button type="primary" @click="zbLoadData" style="background-color: rgb(26, 179, 148);">查询</a-button>
</a-col>
@ -76,6 +81,7 @@ function zbLoadData() {
xxkcqueryParam.value.skxs = '1'
xxkcqueryParam.value.type = 0
xxkcqueryParam.value.jzwh = queryParam.value.jzwh
xxkcqueryParam.value.zhjs = queryParam.value.zhjs
//-----------------------------------------
txhyqueryParam.value.skrq = queryParam.value.ywTime
@ -85,6 +91,7 @@ function zbLoadData() {
txhyqueryParam.value.zbpx ='1'
txhyqueryParam.value.ywskxs = '1'
xxkcqueryParam.value.type = 0
xxkcqueryParam.value.zhjs = queryParam.value.zhjs
zibiaoCard(1);
}
/**

View File

@ -25,6 +25,11 @@
<a-input placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc"></a-input>
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="是否线上课" v-model:value="queryParam.zhjs" dictCode="yn" />
</a-form-item>
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" style="padding: 10px;">
<a-button type="primary" @click="zbLoadData" style="background-color: rgb(26, 179, 148);">查询</a-button>
</a-col>
@ -74,6 +79,7 @@ const txhyTotal = ref<any>(0);
const wqxxkcModeal = ref();
const txhyModeal = ref();
function zbLoadData() {
console.log("sfyzhjs--->",queryParam.value.zhjs)
//----------------------线-------------------
xxkcqueryParam.value.skrq = queryParam.value.ywTime
xxkcqueryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',')
@ -82,6 +88,7 @@ function zbLoadData() {
xxkcqueryParam.value.skxs = 1
xxkcqueryParam.value.type = 1
xxkcqueryParam.value.jzwh = queryParam.value.jzwh
xxkcqueryParam.value.zhjs = queryParam.value.zhjs
//-----------------------------------------
txhyqueryParam.value.skrq = queryParam.value.ywTime
@ -90,7 +97,8 @@ function zbLoadData() {
txhyqueryParam.value.ywmc = queryParam.value.ywmc
txhyqueryParam.value.zbpx = 1
txhyqueryParam.value.ywskxs = '1'
xxkcqueryParam.value.type = 1
txhyqueryParam.value.type = 1
txhyqueryParam.value.zhjs = queryParam.value.zhjs
zibiaoCard(1);
}
/**