修改bug
This commit is contained in:
parent
08bf2a8f98
commit
054c7a3e8d
|
@ -7,47 +7,54 @@
|
|||
<!--查询区域-->
|
||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" >
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="4">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="听课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-date-picker
|
||||
:showTime="false"
|
||||
valueFormat="YYYY-MM-DD"
|
||||
:placeholder="'请选择开始时间'"
|
||||
v-model:value="queryParam.startTime"
|
||||
style="width:100%;"
|
||||
></a-date-picker>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-date-picker
|
||||
:showTime="false"
|
||||
valueFormat="YYYY-MM-DD"
|
||||
:placeholder="'请选择结束时间'"
|
||||
v-model:value="queryParam.endTime"
|
||||
style="width:100%;"
|
||||
></a-date-picker>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="4">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-input placeholder="填写教师名称" v-model:value="queryParam.username"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
|
||||
<a-button type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
|
||||
|
|
|
@ -4,27 +4,27 @@
|
|||
<!--查询区域-->
|
||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" >
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="4">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="听课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<JDictSelectTag placeholder="课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-date-picker
|
||||
:showTime="false"
|
||||
|
@ -34,7 +34,7 @@
|
|||
></a-date-picker>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="3">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-date-picker
|
||||
:showTime="false"
|
||||
|
@ -44,7 +44,12 @@
|
|||
></a-date-picker>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="4">
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-input placeholder="填写教师名称" v-model:value="queryParam.username"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
|
||||
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
|
||||
<a-button type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-form-item label="">
|
||||
<a-input placeholder="填写教师名称" v-model:value="queryParam.username" dictCode="is_open"/>
|
||||
<a-input placeholder="填写教师名称" v-model:value="queryParam.username" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
|
|
|
@ -4,26 +4,40 @@
|
|||
<a-col :span="24" style="text-align: center;"><strong style="font-size: 16px;">听课周统计</strong></a-col>
|
||||
<a-col :span="24">
|
||||
<a-row>
|
||||
<a-col :span="6">
|
||||
<a-col :span="5">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-col :span="5">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<JDictSelectTag placeholder="听课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`" @change="loadData"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-col :span="5">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<JDictSelectTag placeholder="课程性质" v-model:value="queryParam.kcxz" dictCode="kcxz" @change="loadData"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-col :span="5">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<JDictSelectTag placeholder="开课单位" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" @change="loadData"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="4">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<a-select
|
||||
ref="select"
|
||||
v-model:value="queryParam.djz"
|
||||
style="width: 120px"
|
||||
@change="loadData"
|
||||
>
|
||||
<a-select-option :value="item.bxqkssj" v-for="(item,index) in djzData">{{item.flag1}}</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
||||
|
||||
</a-row>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
|
@ -42,21 +56,48 @@ import { dateFormat } from '/@/utils/common/compUtils';
|
|||
import { defHttp } from '/@/utils/http/axios';
|
||||
|
||||
const barMultiData = reactive<any>([]);
|
||||
const djzData = reactive<any>([]);
|
||||
const queryParam = ref<any>({});
|
||||
const list = (queryParam) => defHttp.get({ url: '/kcTingke/kcTingke/getTkztjList', params:queryParam });
|
||||
const listDjz = (queryParam) => defHttp.get({ url: '/kcSysConfig/kcSysConfig/getDjz', params:queryParam });
|
||||
|
||||
//进入就加载
|
||||
onMounted(() => {
|
||||
const format = 'yyyy-MM-dd';
|
||||
const startTime = new Date();
|
||||
startTime.setTime(startTime.getTime()-60000*60*24*7)
|
||||
queryParam.value.startTime = dateFormat(startTime, format)
|
||||
queryParam.value.endTime = dateFormat(new Date(), format)
|
||||
// const format = 'yyyy-MM-dd';
|
||||
// const startTime = new Date();
|
||||
// startTime.setTime(startTime.getTime()-60000*60*24*7)
|
||||
// queryParam.value.startTime = dateFormat(startTime, format)
|
||||
// queryParam.value.endTime = dateFormat(new Date(), format)
|
||||
|
||||
listDjz({}).then(res=>{
|
||||
console.log(`🚀 ~ file: tkztj.vue:59 ~ list ~ res:`, res)
|
||||
var list = res
|
||||
var kssj = "";
|
||||
for(var i=0;i<list.length;i++){
|
||||
var dqsj = list[i].bxqkssj+","+list[i].bxqjssj
|
||||
djzData.push({bxqkssj:dqsj,flag1:list[i].flag1})
|
||||
if(list[i].flag2 == '1'){
|
||||
kssj = dqsj
|
||||
}
|
||||
}
|
||||
console.log(`🚀 ~ file: tkztj.vue:81 ~ listDjz ~ kssj:`, kssj)
|
||||
queryParam.value.djz = kssj
|
||||
loadData()
|
||||
})
|
||||
});
|
||||
|
||||
function loadData(){
|
||||
barMultiData.length = 0
|
||||
|
||||
var dqsj = queryParam.value.djz
|
||||
console.log(`🚀 ~ file: tkztj.vue:93 ~ loadData ~ dqsj:`, dqsj)
|
||||
var sjjh = dqsj.split(",");
|
||||
console.log(`🚀 ~ file: tkztj.vue:95 ~ loadData ~ sjjh:`, sjjh)
|
||||
|
||||
queryParam.value.startTime = sjjh[0]
|
||||
queryParam.value.endTime = sjjh[1]
|
||||
console.log(`🚀 ~ file: tkztj.vue:97 ~ loadData ~ queryParam.value:`, queryParam.value)
|
||||
|
||||
list(queryParam.value).then(res=>{
|
||||
console.log(`🚀 ~ file: tkztj.vue:59 ~ list ~ res:`, res)
|
||||
var list = res
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
</a-col>
|
||||
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 3 }">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
|
||||
<JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
|
||||
|
@ -32,9 +32,6 @@
|
|||
<a-input-search placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc" enter-button="查询" @search="zbLoadData"></a-input-search>
|
||||
</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> -->
|
||||
</a-row>
|
||||
|
||||
<a-tabs v-model:activeKey="rkbActiveKey" type="card" @change="zibiaoCard">
|
||||
|
@ -90,7 +87,7 @@ function zbLoadData() {
|
|||
xxkcqueryParam.value.ywmc = queryParam.value.ywmc
|
||||
xxkcqueryParam.value.kcxz = queryParam.value.kcxz
|
||||
xxkcqueryParam.value.skxs = '1'
|
||||
xxkcqueryParam.value.skdd = queryParam.value.skdd
|
||||
xxkcqueryParam.value.jzwh = queryParam.value.jzwh
|
||||
|
||||
//----------------------腾讯会议-------------------
|
||||
txhyqueryParam.value.skrq = queryParam.value.ywTime
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
</a-col>
|
||||
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
|
||||
<JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
|
||||
|
@ -36,7 +36,7 @@
|
|||
<kclbList ref="wqxxkcModeal" :queryParam="xxkcqueryParam" @set-total="xxkcTotal = $event;jzzyload()"></kclbList>
|
||||
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2">
|
||||
<!-- <a-tab-pane key="2">
|
||||
<template #tab>
|
||||
<div>
|
||||
<div style="float: left;">腾讯会议</div>
|
||||
|
@ -46,7 +46,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<kclbList ref="txhyModeal" :queryParam="txhyqueryParam" @set-total="txhyTotal = $event;jzzyload()"></kclbList>
|
||||
</a-tab-pane>
|
||||
</a-tab-pane> -->
|
||||
</a-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -75,7 +75,7 @@ function zbLoadData() {
|
|||
xxkcqueryParam.value.ywmc = queryParam.value.ywmc
|
||||
xxkcqueryParam.value.skxs = '1'
|
||||
xxkcqueryParam.value.type = 0
|
||||
xxkcqueryParam.value.skdd = queryParam.value.skdd
|
||||
xxkcqueryParam.value.jzwh = queryParam.value.jzwh
|
||||
|
||||
//----------------------腾讯会议-------------------
|
||||
txhyqueryParam.value.skrq = queryParam.value.ywTime
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
</a-col>
|
||||
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
|
||||
<a-form-item label="" style="padding: 10px;">
|
||||
<a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
|
||||
<JDictSelectTag placeholder="请选择教学楼" v-model:value="queryParam.jzwh" :dictCode="`xxhbjxljbxx,jzwmc,jzwh`" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
|
||||
|
@ -42,7 +42,7 @@
|
|||
<kclbList ref="wqxxkcModeal" :queryParam="xxkcqueryParam" @set-total="xxkcTotal = $event;jzzyload()"></kclbList>
|
||||
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2">
|
||||
<!-- <a-tab-pane key="2">
|
||||
<template #tab>
|
||||
<div>
|
||||
<div style="float: left;">腾讯会议</div>
|
||||
|
@ -52,7 +52,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<kclbList ref="txhyModeal" :queryParam="txhyqueryParam" @set-total="txhyTotal = $event;jzzyload()"></kclbList>
|
||||
</a-tab-pane>
|
||||
</a-tab-pane> -->
|
||||
</a-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -81,7 +81,7 @@ function zbLoadData() {
|
|||
xxkcqueryParam.value.ywmc = queryParam.value.ywmc
|
||||
xxkcqueryParam.value.skxs = 1
|
||||
xxkcqueryParam.value.type = 1
|
||||
xxkcqueryParam.value.skdd = queryParam.value.skdd
|
||||
xxkcqueryParam.value.jzwh = queryParam.value.jzwh
|
||||
|
||||
//----------------------腾讯会议-------------------
|
||||
txhyqueryParam.value.skrq = queryParam.value.ywTime
|
||||
|
|
Loading…
Reference in New Issue