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

修改bug

This commit is contained in:
yangjun 2023-04-14 23:37:01 +08:00
parent 5c9b2f5cfe
commit 280807d534
21 changed files with 218 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/kc/index/tpkqk/tpkqk.data.ts
View File

@ -4,15 +4,6 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '行号',
align: "center",
dataIndex: '$no',
width: '50px',
customRender: (r) => {
return r.index+1;
}
},
{
title: '开课单位',
align: "center",

3
src/views/kc/index/tpkqk/tpkqk.vue
View File

@ -1,5 +1,8 @@
<template>
<div class="tktjClass">
<div style=" font-size: 24px; font-weight: 600; line-height: 60px; margin-bottom: 20px;">
听评课情况
</div>
<!--查询区域-->
<a-form @keyup.enter.native="searchQuery" :model="queryParam" >
<a-row :gutter="24">

27
src/views/kc/kcSuggestions/KcSuggestions.data.ts
View File

@ -4,35 +4,26 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '提交人姓名',
title: '工学号',
align: "center",
dataIndex: 'userid'
},
{
title: '提交人',
align: "center",
dataIndex: 'username'
},
{
title: '意见建议内容',
align: "center",
dataIndex: 'suggestions'
},
{
title: '反馈内容',
align: "center",
dataIndex: 'feedback'
},
{
title: '反馈人姓名',
align: "center",
dataIndex: 'feedbackusername'
},
{
title: '提交时间',
align: "center",
dataIndex: 'suggestionstime'
},
{
title: '反馈时间',
title: '建议内容',
align: "center",
dataIndex: 'feedbacktime'
dataIndex: 'suggestions'
},
];

74
src/views/kc/kcSuggestions/KcSuggestionsList.vue
View File

@ -1,37 +1,48 @@
<template>
<div>
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<div class="jeecg-basic-table-form-containera">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :span="4">
<a-form-item label="">
<a-date-picker
:showTime="false"
valueFormat="YYYY-MM-DD"
:placeholder="'请选择开始时间'"
v-model:value="queryParam.startTime"
style="width:200px;"
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="4">
<a-form-item label="">
<a-date-picker
:showTime="false"
valueFormat="YYYY-MM-DD"
:placeholder="'请选择结束时间'"
v-model:value="queryParam.endTime"
style="width:200px;"
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="4">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<BasicTable @register="registerTable" >
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" 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">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
</template>
<!--操作栏-->
<template #action="{ record }">
<!-- <template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
</template> -->
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
@ -51,12 +62,13 @@
</template>
<script lang="ts" name="kcSuggestions-kcSuggestions" setup>
import { ref, reactive } from 'vue';
import { ref, reactive, onMounted } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './KcSuggestions.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcSuggestions.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { dateFormat } from '/@/utils/common/compUtils';
import KcSuggestionsModal from './components/KcSuggestionsModal.vue'
const queryParam = ref<any>({});
@ -70,6 +82,7 @@
columns,
canResize:false,
useSearchForm: false,
showActionColumn: false,
actionColumn: {
width: 120,
fixed: 'right',
@ -98,6 +111,15 @@
sm: { span: 16 },
});
//进入就加载
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)
// searchQuery()
});
/**
* 新增事件
*/
@ -212,4 +234,14 @@
text-align: center
}
}
.jeecg-basic-table-form-containera{
line-height: 24px;
background: #fff;
padding: 20px 0 0 10px;
margin-bottom: -20px;
}
.jeecg-basic-table .ant-table-wrapper .ant-table-title {
min-height: 0px !important;
padding: 0 0 8px 0 !important;
}
</style>

6
src/views/kc/pktj/pkfgl/pkfgl.vue
View File

@ -1,17 +1,17 @@
<template>
<div class="tktjClass">
<a-row>
<a-col :span="24" style="text-align: center;"><strong style="font-size: 16px;">听课周统计</strong></a-col>
<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-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" />
<JDictSelectTag placeholder="评课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="听课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`" @change="loadData"/>
<JDictSelectTag placeholder="评课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`" @change="loadData"/>
</a-form-item>
</a-col>
<a-col :span="6">

2
src/views/kc/pktj/pkmxb/pkmxb.api.ts
View File

@ -10,7 +10,7 @@ enum Api {
deleteOne = '/qa/kcEvaluation/delete',
deleteBatch = '/qa/kcEvaluation/deleteBatch',
importExcel = '/qa/kcEvaluation/importExcel',
exportXls = '/qa/kcEvaluation/exportXls',
exportXls = '/qa/kcEvaluation/exportPkmxbXls',
}
/**

47
src/views/kc/pktj/pkmxb/pkmxb.data.ts
View File

@ -7,57 +7,80 @@ export const columns: BasicColumn[] = [
{
title: '工号',
align: "center",
dataIndex: 'userid'
dataIndex: 'userid',
slots: { customRender: 'openDcwj' },
},
{
title: '姓名',
align: "center",
dataIndex: 'username'
dataIndex: 'username',
slots: { customRender: 'openDcwj' },
},
{
title: '所在单位',
align: "center",
dataIndex: 'college'
dataIndex: 'college',
slots: { customRender: 'openDcwj' },
},
{
title: '听课身份',
align: "center",
dataIndex: 'tksf'
dataIndex: 'tksf',
slots: { customRender: 'openDcwj' },
},
{
title: '开课单位',
align: "center",
dataIndex: 'kkdw'
dataIndex: 'kkdw',
slots: { customRender: 'openDcwj' },
},
{
title: '课程名称',
align: "center",
dataIndex: 'kcmc'
dataIndex: 'kcmc',
slots: { customRender: 'openDcwj' },
},
{
title: '课程性质',
align: "center",
dataIndex: 'kcxz'
dataIndex: 'kcxz',
slots: { customRender: 'openDcwj' },
},
{
title: '任课教师',
align: "center",
dataIndex: 'skjs'
dataIndex: 'skjs',
slots: { customRender: 'openDcwj' },
},
{
title: '周次',
align: "center",
dataIndex: 'zc'
dataIndex: 'zc',
slots: { customRender: 'openDcwj' },
},
{
title: '节次',
align: "center",
dataIndex: 'jc'
dataIndex: 'jc',
slots: { customRender: 'openDcwj' },
},
{
title: '听课时间',
title: '评课日期',
align: "center",
dataIndex: 'tingketime'
dataIndex: 'upDate',
slots: { customRender: 'openDcwj' },
},
{
title: '评课时间',
align: "center",
dataIndex: 'upTime',
slots: { customRender: 'openDcwj' },
},
{
title: '评课标准',
align: "center",
dataIndex: 'bz',
slots: { customRender: 'openDcwj' },
},
];

34
src/views/kc/pktj/pkmxb/pkmxb.vue
View File

@ -1,6 +1,9 @@
<template>
<div class="tktjClass">
<div style="font-size: 22px;font-weight: bold;margin: 20px;">评课明细表</div>
<div style="margin-bottom: 20px;">
<span style="font-size: 22px;font-weight: bold;margin: 20px;">评课明细表</span>
<span style="color: #9a9a9a;">（点击下方数据查看问卷内容）</span>
</div>
<!--查询区域-->
<a-form @keyup.enter.native="searchQuery" :model="queryParam" >
<a-row :gutter="24">
@ -44,19 +47,23 @@
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="3">
<a-col :span="4">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</a-col>
<a-button type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
</span>
</a-col>
</a-row>
</a-form>
<!--引用表格-->
<BasicTable @register="registerTable">
<template #openDcwj="{ text ,record}">
<span @click="openDcwjxx(record)">{{text}}</span>
</template>
</BasicTable>
<!-- 表单区域 -->
<viewModalPage ref="viewModal"/>
</div>
</template>
@ -68,10 +75,12 @@
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './pkmxb.api';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { dateFormat } from '/@/utils/common/compUtils';
import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const viewModal = ref();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
@ -91,8 +100,9 @@
},
},
exportConfig: {
name: "开课单位统计",
name: "评课明细表",
url: getExportUrl,
params: queryParam.value,
},
importConfig: {
url: getImportUrl,
@ -143,6 +153,14 @@
reload();
}
function openDcwjxx(record){
console.log(`🚀 ~ file: pkmxb.vue:150 ~ openDcwjxx ~ record:`, record)
let { kcmc,skjs,zc:WEEK,jc:hh,userid,id:ketangbiaoid,evaluationver,} = record;
//jc,zc,evaId
//{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }}
//userid: record.userid, minkcid: record.ketangbiaoid, evaluationver: record.evaluationver
viewModal.value.view({kcmc,skjs,WEEK,hh,userid,ketangbiaoid,evaluationver})
}
@ -166,3 +184,9 @@
}
}
</style>
<style>
.jee-hidden{
display: none;
}
</style>

10
src/views/kc/pktj/pktjb/pktjb.data.ts
View File

@ -17,27 +17,27 @@ export const columns: BasicColumn[] = [
{
title: '听课人所在单位',
align: "center",
dataIndex: 'tksf1'
dataIndex: 'tkdw'
},
{
title: '听课身份',
align: "center",
dataIndex: 'tkyq'
dataIndex: 'tksf1'
},
{
title: '评课要求',
align: "center",
dataIndex: 'sjtksl'
dataIndex: 'tkyq'
},
{
title: '实际听课数',
align: "center",
dataIndex: 'mltksl'
dataIndex: 'sjtksl'
},
{
title: '其中马列教研室课程数',
align: "center",
dataIndex: 'tkdw'
dataIndex: 'mltksl'
},
];

8
src/views/kc/pktj/pktjb/pktjb.vue
View File

@ -44,11 +44,10 @@
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="3">
<a-col :span="4">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</a-col>
<a-button type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
</span>
</a-col>
</a-row>
@ -90,8 +89,9 @@
},
},
exportConfig: {
name: "听课人员统计",
name: "评课统计表",
url: getExportUrl,
params: queryParam.value,
},
importConfig: {
url: getImportUrl,

4
src/views/kc/pktj/pkztj/pkztj.vue
View File

@ -6,12 +6,12 @@
<a-row>
<a-col :span="6">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="听课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" />
<JDictSelectTag placeholder="评课身份" v-model:value="queryParam.tksf" dictCode="kc_tksf" @change="loadData" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item label="" style="padding: 10px;">
<JDictSelectTag placeholder="听课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`" @change="loadData"/>
<JDictSelectTag placeholder="评课人所在单位" v-model:value="queryParam.szdw" :dictCode="`tkrszdw_view,college,college`" @change="loadData"/>
</a-form-item>
</a-col>
<a-col :span="6">

31
src/views/kc/tktj/kcTingke/KcTingke.data.ts
View File

@ -4,15 +4,6 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '行号',
align: "center",
dataIndex: '$no',
width: '50px',
customRender: (r) => {
return r.index+1;
}
},
{
title: '职工号',
align: "center",
@ -26,32 +17,44 @@ export const columns: BasicColumn[] = [
{
title: '听课人所在单位',
align: "center",
dataIndex: 'tksf1'
dataIndex: 'tkdw'
},
{
title: '听课身份',
align: "center",
dataIndex: 'tkyq'
dataIndex: 'tksf1'
},
{
title: '听课要求',
align: "center",
dataIndex: 'sjtksl'
dataIndex: 'tkyq'
},
{
title: '实际听课数',
align: "center",
dataIndex: 'mltksl'
dataIndex: 'sjtksl'
},
{
title: '其中马列教研室课程数',
align: "center",
dataIndex: 'tkdw'
dataIndex: 'mltksl'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: '开始时间',
field: 'startTime',
component: 'Input',
colProps: { span: 6 },
},
{
label: '结束时间',
field: 'endTime',
component: 'Input',
colProps: { span: 6 },
},
];
//表单数据

11
src/views/kc/tktj/kcTingke/KcTingkeList.vue
View File

@ -43,11 +43,10 @@
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="3">
<a-col :span="4">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</a-col>
<a-button type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
</span>
</a-col>
</a-row>
@ -94,6 +93,7 @@
exportConfig: {
name: "听课人员统计",
url: getExportUrl,
params: queryParam.value,
},
importConfig: {
url: getImportUrl,
@ -125,7 +125,9 @@
(selectedRowKeys.value = []) && reload();
}
function daochu(){
}
/**
* 查询
*/
@ -146,6 +148,7 @@
</script>
<style lang="less" scoped>

2
src/views/kc/tktj/kcTingke/kkdw.api.ts
View File

@ -10,7 +10,7 @@ enum Api {
deleteOne = '/kcTingke/kcTingke/delete',
deleteBatch = '/kcTingke/kcTingke/deleteBatch',
importExcel = '/kcTingke/kcTingke/importExcel',
exportXls = '/kcTingke/kcTingke/exportXls',
exportXls = '/kcTingke/kcTingke/exportKkdwXls',
}
/**

9
src/views/kc/tktj/kcTingke/kkdw.data.ts
View File

@ -4,15 +4,6 @@ import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '行号',
align: "center",
dataIndex: '$no',
width: '50px',
customRender: (r) => {
return r.index+1;
}
},
{
title: '开课单位',
align: "center",

11
src/views/kc/tktj/kcTingke/kkdw.vue
View File

@ -43,11 +43,10 @@
></a-date-picker>
</a-form-item>
</a-col>
<a-col :span="3">
<a-col :span="4">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</a-col>
<a-button type="primary" preIcon="ant-design:export-outlined" style="margin-left: 10px;" @click="onExportXls"> 导出</a-button>
</span>
</a-col>
</a-row>
@ -92,6 +91,7 @@
exportConfig: {
name: "开课单位统计",
url: getExportUrl,
params: queryParam.value,
},
importConfig: {
url: getImportUrl,
@ -124,7 +124,10 @@
(selectedRowKeys.value = []) && reload();
}
function daochu(){
}
/**
* 查询
*/

37
src/views/kc/tktj/kcTingke/tkrytj.vue
View File

@ -1,17 +1,40 @@
<template>
<div class="tktjClass">
<a-tabs v-model:activeKey="activeKey" type="card">
<a-tab-pane key="1" tab="听课人员统计"><KcTingkeList ref="KcTingkeListModal"></KcTingkeList></a-tab-pane>
<a-tab-pane key="2" tab="开课单位统计"><kkdw ref="kkdwModal"></kkdw></a-tab-pane>
</a-tabs>
<div>
<span style="font-size: 24px; font-weight: 600;">
<span style="color: #18a689;">{{activeTitle}}</span>统计
</span>
<a-button type="primary" preIcon="ant-design:search-outlined" @click="tongji(1)" style="margin-left: 10px;">听课人员统计</a-button>
<a-button type="primary" preIcon="ant-design:search-outlined" @click="tongji(2)" style="margin-left: 10px;">开课单位统计</a-button>
</div>
<div v-show="activeKey == '1'" style="margin-top: 20px;">
<KcTingkeList ref="KcTingkeListModal"></KcTingkeList>
</div>
<div v-show="activeKey == '2'" style="margin-top: 20px;">
<kkdw ref="kkdwModal"></kkdw>
</div>
<!-- <a-tabs v-model:activeKey="activeKey" type="card">
<a-tab-pane key="1" tab="听课人员统计"><KcTingkeList ref="KcTingkeListModal"></KcTingkeList></a-tab-pane>
<a-tab-pane key="2" tab="开课单位统计"><kkdw ref="kkdwModal"></kkdw></a-tab-pane>
</a-tabs> -->
</div>
</template>
<script lang="ts" name="kcTingke-tkrytj" setup>
import { ref } from 'vue';
import KcTingkeList from './KcTingkeList.vue'//听课人员统计
import kkdw from './kkdw.vue'//听课人员统计
import KcTingkeList from './KcTingkeList.vue'//听课人员统计
import kkdw from './kkdw.vue'//开课单位统计
let activeKey = ref('1');
let activeTitle = ref('听课人员');
function tongji(val){
if(val==1){
activeKey.value = "1"
activeTitle.value = "听课人员"
}else{
activeKey.value = "2"
activeTitle.value = "开课单位"
}
}
</script>
<style lang="less" scoped>
</style>

2
src/views/kc/tktj/tkfgl/tkfgl.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="tktjClass">
<a-row>
<a-col :span="24" style="text-align: center;"><strong style="font-size: 16px;">评课覆盖率</strong></a-col>
<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">

8
src/views/kc/tktj/tkfgl/tkfglTjt.vue
View File

@ -44,6 +44,14 @@
backgroundColor: '#333',
},
},
formatter: (params) => {
return params[0].name + '<br>' +
params[0].marker + ' ' + params[0].seriesName + ': ' + params[0].data + ' %' + '<br>' +
params[1].marker + ' ' + params[1].seriesName + ': ' + params[1].data + ' %' + '<br>' +
params[2].marker + ' ' + params[2].seriesName + ': ' + params[2].data + ' %'+ '<br>' +
params[2].marker + ' ' + params[2].seriesName + ': ' + params[2].data + ' %';
},
},
legend: {
bottom: 0,

2
src/views/kc/tktj/tkztj/tkztjTjt.vue
View File

@ -86,6 +86,8 @@
let chartArr = props.chartData.filter((item) => type === item.type);
//data数据
obj['data'] = chartArr.map((item) => item.value);
obj['type'] = chartArr[0].seriesType;
obj['label'] = { show: true, position: 'top', color:'black' };
seriesData.push(obj);
});
option.series = seriesData;

1
src/views/site/tingKeZuJi/components/viewModal.vue
View File

@ -29,6 +29,7 @@
function view(record) {
visible.value = true;
disableSubmit.value = true;
console.log(`🚀 ~ file: viewModal.vue:32 ~ view ~ disableSubmit.value:`, disableSubmit.value)
form.value = record;
nextTick(() => {
registerForm.value.view(record);