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

2023年7月26日 新增评价结果页面修改部分内容

This commit is contained in:
bai 2023-07-26 00:04:00 +08:00
parent ccb46db055
commit 485b6d831d
11 changed files with 593 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts
View File

@ -30,11 +30,11 @@ export const columns: BasicColumn[] = [
// align: "center",
// dataIndex: 'xyjwmsshyj'
// },
{
title: 'yjxq',
align: "center",
dataIndex: 'yjxq'
},
// {
// title: 'yjxq',
// align: "center",
// dataIndex: 'yjxq'
// },
{
title: '申请人单位',
align: "center",
@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'kcxxbh'
},
{
title: '学期',
title: '校区',
align: "center",
dataIndex: 'xq'
},

8
src/views/kc/xxhbtkxx/XxhbtkxxList.vue
View File

@ -30,11 +30,11 @@
<j-input placeholder="请输入xyjwmsshyj" v-model:value="queryParam.xyjwmsshyj"></j-input>
</a-form-item>
</a-col> -->
<a-col :lg="8">
<!-- <a-col :lg="8">
<a-form-item label="yjxq">
<j-input placeholder="请输入yjxq" v-model:value="queryParam.yjxq"></j-input>
</a-form-item>
</a-col>
</a-col> -->
<a-col :lg="8">
<a-form-item label="申请人单位">
<j-input placeholder="请输入申请人单位" v-model:value="queryParam.sqrdw"></j-input>
@ -101,8 +101,8 @@
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="学期">
<j-input placeholder="请输入学期" v-model:value="queryParam.xq"></j-input>
<a-form-item label="校区">
<j-input placeholder="请输入校区" v-model:value="queryParam.xq"></j-input>
</a-form-item>
</a-col>
<a-col :lg="8">

8
src/views/kc/xxhbtkxx/components/XxhbtkxxForm.vue
View File

@ -27,11 +27,11 @@
<a-input v-model:value="formData.xyjwmsshyj" placeholder="请输入xyjwmsshyj" :disabled="disabled"></a-input>
</a-form-item>
</a-col> -->
<a-col :span="12">
<!-- <a-col :span="12">
<a-form-item label="yjxq" v-bind="validateInfos.yjxq">
<a-input v-model:value="formData.yjxq" placeholder="请输入yjxq" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
</a-col> -->
<a-col :span="12">
<a-form-item label="申请人单位" v-bind="validateInfos.sqrdw">
<a-input v-model:value="formData.sqrdw" placeholder="请输入申请人单位" :disabled="disabled"></a-input>
@ -98,8 +98,8 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="学期" v-bind="validateInfos.xq">
<a-input v-model:value="formData.xq" placeholder="请输入学期" :disabled="disabled"></a-input>
<a-form-item label="校区" v-bind="validateInfos.xq">
<a-input v-model:value="formData.xq" placeholder="请输入校区" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="12">

4
src/views/site/index.vue
View File

@ -17,7 +17,7 @@
<!-- 任教教程 -->
<renKeJiaoChengPage v-if="getUserSf()=='T'&&getSysConfig().flag2=='1'" />
<!-- 评价结果 -->
<pjjgPage hidden/>
<pjjgPage/>
<!-- 预约课程 -->
<yuYueKeChengPage ref="yykcModeal" @orther-load="yykcLoad" v-if="getUserSf()=='T'&&getSysConfig().flag3=='1'"/>
<!-- 精彩公开课 -->
@ -84,7 +84,7 @@
import ktsbPage from '/@/views/site/ktsb/index.vue'
import kclbZzsk from '/@/views/site/jrkclb/kclbZzsk.vue';
import kclbXyjk from '/@/views/site/jrkclb/kclbXyjk.vue';
import kclbRkb from '/@/views/site/jrkclb/kclbRkb.vue';

187
src/views/site/pjjgPage/components/jspjList.vue Normal file
View File

@ -0,0 +1,187 @@
<template>
<a-spin :spinning="confirmLoading">
<a-card>
<a-table :data-source="dataSource" :pagination="ipagination" bordered size="middle" :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" class="ant-table-striped" @change="tableChange">
<a-table-column title="序号" key="index" data-index="index">
<template #default="{ index }">
{{ index + 1 }}
</template>
</a-table-column>
<a-table-column title="课程名称" key="kcmc" data-index="kcmc"/>
<a-table-column title="评价时间" key="upTimestamp" data-index="upTimestamp">
<template #default="{ record }">
{{ record.tkrq }} {{ record.shijian }}
</template>
</a-table-column>
<a-table-column title="操作" key="action" data-index="action">
<template #default="{ record }">
<a @click="viewModal.view(record)">详情</a>
</template>
</a-table-column>
</a-table>
</a-card>
</a-spin>
<viewModalPage ref="viewModal"/>
</template>
<script lang="ts" setup>
import { ref, reactive, watch, onMounted, Ref } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useRoute } from 'vue-router'
import { useMessage } from '/@/hooks/web/useMessage';
import { getUserId } from '/@/views/site/utils';
import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
enum Api {
list = '/qa/kcEvaluation/queryPkZuJiList'
// queryResData = '/qa/kcEvaluation/queryByParam',
// que = '//qa/kcEvaluationque/list',
// ans = '/qa/kcEvaluationans/list',
}
const viewModal = ref<any>({});
const queryParam:Ref<any> = ref({});
const loading = ref<boolean>(false);
const dataSource = ref<any>([]);
const ipagination = ref<any>({
current: 1,
pageSize: 5,
pageSizeOptions: ['10', '20', '30'],
showTotal: (total, range) => {
return range[0] + '-' + range[1] + ' 共' + total + '条';
},
showQuickJumper: true,
showSizeChanger: true,
total: 0,
});
const confirmLoading = ref<boolean>(false);
const { createMessage } = useMessage();
const route = useRoute();
function view(record){
console.log(`🚀 ~ file: viewForm.vue:72 ~ view ~ record:`, record)
console.log(route.query);
// defHttp.get({ url: Api.list, params: { jgh: getUserId(), searchByNowXqxn: true }}).then(res => {
// console.log(`🚀 ----------------------------------------------------🚀`);
// console.log(`🚀 ~ file: jspjList.vue:79 ~ defHttp.get ~ res:`, res);
// console.log(`🚀 ----------------------------------------------------🚀`);
// list.value = res?.records || [];
// });
queryParam.value.kechengbiaoid = record.id
loadData(1);
}
function tableChange(pagination) {
ipagination.value.current = pagination.current;
ipagination.value.pageSize = pagination.pageSize;
loadData();
}
function loadData(pageNo?){
loading.value = true;
let params = { pageNo: 0, pageSize: 10 };
params.pageNo = ipagination.value.current;
params.pageSize = ipagination.value.pageSize;
if(pageNo === 1){
params.pageNo = 1;
}
defHttp.get({ url: Api.list, params: { ...params, ...queryParam.value, jgh: getUserId(), searchByNowXqxn: true }}).then(res => {
dataSource.value = (res?.records) ?? [];
ipagination.value.total = res.total;
}).finally(() => {
loading.value = false;
});
}
// let params = { pageSize: -1, status: 0, column: 'ordernum', order: 'asc' }
// //回答记录
// let queryData = defHttp.get({ url: Api.queryResData, params: { userid: (record.userid || record.upuserid), minkcid: record.ketangbiaoid, evaluationver: record.evaluationver} });
// //题目
// let queryQue = defHttp.get({ url: Api.que, params: { ...params, evaluationver: record.evaluationver } });
// //答案列表
// let queryAns = defHttp.get({ url: Api.ans, params });
// Promise.all([queryData,queryQue,queryAns]).then(([resData, resQue, resAns]) => {
// console.log('resData =>',resData);
// let dataList = resData?.ansList ?? [];
// let queList = resQue?.records;
// let ansList = resAns?.records;
// let queMap = {},ansMap = {}, dataMap = {};
// dataList.forEach(x => {
// let list = dataMap[x.queid];
// if(!list){
// list = [];
// dataMap[x.queid] = list;
// }
// list.push(x);
// })
// queList.forEach(x => {
// x.seleckedList = [];
// queMap[x.id] = x;
// x.seleckedList = dataMap[x.id];
// selectedMap.value[x.id] = '';
// });
// ansList.forEach(x => {
// let data = queMap[x.queid];
// ansMap[x.id] = x;
// if(data){
// let list = data.list;
// if(!list){
// list = [];
// queMap[x.queid].list = list;
// }
// list.push(x);
// }
// });
// list.value = queList;
// ansvMap.value = ansMap;
// });
// }
// function getAns(selecked){
// if(!selecked || !ansvMap.value) return {};
// return ansvMap.value[selecked.ansid]??{};
// }
// function calcSum(list,key) {
// let sum = 0;
// list.forEach(x => {
// let num = getAns(x)[key];
// if(num){
// sum += Number(num);
// }
// });
// return sum;
// }
defineExpose({
view,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
// min-height: 500px !important;
overflow-y: auto;
padding: 24px 24px 24px 24px;
}
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa;
}
</style>

89
src/views/site/pjjgPage/components/jspjModal.vue Normal file
View File

@ -0,0 +1,89 @@
<template>
<div class="pjjgPageBase">
<a-modal :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" :getContainer="getPDom" cancelText="关闭">
<template #title>
<!-- <div style="text-align: center;">{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }}节</div> -->
教师评价
</template>
<baseForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"/>
</a-modal>
</div>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import baseForm from './jspjList.vue'
const width = ref<number>(1200);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const form = ref();
function getPDom() {
return document.querySelector('.pjjgPageBase')
}
/**
* 新增
*/
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);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
view,
disableSubmit,
});
</script>
<style lang="less" scoped>
/**隐藏样式-modal确定按钮 */
// .renKeJiaoChengBaseModal :deep(.ant-modal-content) {
// text-align: center;
// background: red;
// }
.pjjgPageBase {
.jee-hidden {
display: none !important;
}
// background: orange;
:deep(.ant-modal-content) {
// background: green;
.ant-modal-footer {
text-align: center;
// background: red;
}
}
}
</style>

195
src/views/site/pjjgPage/components/xspjList.vue Normal file
View File

@ -0,0 +1,195 @@
<template>
<a-spin :spinning="confirmLoading">
<a-card>
<a-table :data-source="dataSource" :pagination="ipagination" bordered size="middle" :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" class="ant-table-striped" @change="tableChange">
<a-table-column title="序号" key="index" data-index="index">
<template #default="{ index }">
{{ index + 1 }}
</template>
</a-table-column>
<a-table-column title="课程名称" key="kcmc" data-index="kcmc"/>
<a-table-column title="评价时间" key="uptime" data-index="uptime"/>
<a-table-column title="学生姓名" key="sname" data-index="sname">
<template #default="{ record }">
<template v-if="record.sfnm == 1">
{{ record.sname }}
</template>
<template v-else>
*
</template>
</template>
</a-table-column>
<a-table-column title="评价内容" key="textdeail" data-index="textdeail"/>
<a-table-column title="评分" key="stars" data-index="stars"/>
<!-- <a-table-column title="操作" key="action" data-index="action">
<template #default="{ record }">
<a @click="viewModal.view(record)">详情</a>
</template>
</a-table-column> -->
</a-table>
</a-card>
</a-spin>
<viewModalPage ref="viewModal"/>
</template>
<script lang="ts" setup>
import { ref, reactive, watch, onMounted, Ref } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useRoute } from 'vue-router'
import { useMessage } from '/@/hooks/web/useMessage';
import { getUserId } from '/@/views/site/utils';
import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
enum Api {
list = '/qa/kcEvaluationstudent/queryAllList'
// queryResData = '/qa/kcEvaluation/queryByParam',
// que = '//qa/kcEvaluationque/list',
// ans = '/qa/kcEvaluationans/list',
}
const viewModal = ref<any>({});
const queryParam:Ref<any> = ref({});
const loading = ref<boolean>(false);
const dataSource = ref<any>([]);
const ipagination = ref<any>({
current: 1,
pageSize: 5,
pageSizeOptions: ['10', '20', '30'],
showTotal: (total, range) => {
return range[0] + '-' + range[1] + ' 共' + total + '条';
},
showQuickJumper: true,
showSizeChanger: true,
total: 0,
});
const confirmLoading = ref<boolean>(false);
const { createMessage } = useMessage();
const route = useRoute();
function view(record){
console.log(`🚀 ~ file: viewForm.vue:72 ~ view ~ record:`, record)
console.log(route.query);
// defHttp.get({ url: Api.list, params: { jgh: getUserId(), searchByNowXqxn: true }}).then(res => {
// console.log(`🚀 ----------------------------------------------------🚀`);
// console.log(`🚀 ~ file: jspjList.vue:79 ~ defHttp.get ~ res:`, res);
// console.log(`🚀 ----------------------------------------------------🚀`);
// list.value = res?.records || [];
// });
queryParam.value.ketangbiaoid = record.id
loadData(1);
}
function tableChange(pagination) {
ipagination.value.current = pagination.current;
ipagination.value.pageSize = pagination.pageSize;
loadData();
}
function loadData(pageNo?){
loading.value = true;
let params = { pageNo: 0, pageSize: 10 };
params.pageNo = ipagination.value.current;
params.pageSize = ipagination.value.pageSize;
if(pageNo === 1){
params.pageNo = 1;
}
defHttp.get({ url: Api.list, params: { ...params, ...queryParam.value, jgh: getUserId(), searchByNowXqxn: true }}).then(res => {
dataSource.value = (res?.records) ?? [];
ipagination.value.total = res.total;
}).finally(() => {
loading.value = false;
});
}
// let params = { pageSize: -1, status: 0, column: 'ordernum', order: 'asc' }
// //回答记录
// let queryData = defHttp.get({ url: Api.queryResData, params: { userid: (record.userid || record.upuserid), minkcid: record.ketangbiaoid, evaluationver: record.evaluationver} });
// //题目
// let queryQue = defHttp.get({ url: Api.que, params: { ...params, evaluationver: record.evaluationver } });
// //答案列表
// let queryAns = defHttp.get({ url: Api.ans, params });
// Promise.all([queryData,queryQue,queryAns]).then(([resData, resQue, resAns]) => {
// console.log('resData =>',resData);
// let dataList = resData?.ansList ?? [];
// let queList = resQue?.records;
// let ansList = resAns?.records;
// let queMap = {},ansMap = {}, dataMap = {};
// dataList.forEach(x => {
// let list = dataMap[x.queid];
// if(!list){
// list = [];
// dataMap[x.queid] = list;
// }
// list.push(x);
// })
// queList.forEach(x => {
// x.seleckedList = [];
// queMap[x.id] = x;
// x.seleckedList = dataMap[x.id];
// selectedMap.value[x.id] = '';
// });
// ansList.forEach(x => {
// let data = queMap[x.queid];
// ansMap[x.id] = x;
// if(data){
// let list = data.list;
// if(!list){
// list = [];
// queMap[x.queid].list = list;
// }
// list.push(x);
// }
// });
// list.value = queList;
// ansvMap.value = ansMap;
// });
// }
// function getAns(selecked){
// if(!selecked || !ansvMap.value) return {};
// return ansvMap.value[selecked.ansid]??{};
// }
// function calcSum(list,key) {
// let sum = 0;
// list.forEach(x => {
// let num = getAns(x)[key];
// if(num){
// sum += Number(num);
// }
// });
// return sum;
// }
defineExpose({
view,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
// min-height: 500px !important;
overflow-y: auto;
padding: 24px 24px 24px 24px;
}
.ant-table-striped :deep(.table-striped) td {
background-color: #fafafa;
}
</style>

89
src/views/site/pjjgPage/components/xspjModal.vue Normal file
View File

@ -0,0 +1,89 @@
<template>
<div class="pjjgPageBase">
<a-modal :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" :getContainer="getPDom" cancelText="关闭">
<template #title>
<!-- <div style="text-align: center;">{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }}节</div> -->
学生评价
</template>
<baseForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"/>
</a-modal>
</div>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import baseForm from './xspjList.vue'
const width = ref<number>(1200);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const form = ref();
function getPDom() {
return document.querySelector('.pjjgPageBase')
}
/**
* 新增
*/
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);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
view,
disableSubmit,
});
</script>
<style lang="less" scoped>
/**隐藏样式-modal确定按钮 */
// .renKeJiaoChengBaseModal :deep(.ant-modal-content) {
// text-align: center;
// background: red;
// }
.pjjgPageBase {
.jee-hidden {
display: none !important;
}
// background: orange;
:deep(.ant-modal-content) {
// background: green;
.ant-modal-footer {
text-align: center;
// background: red;
}
}
}
</style>

20
src/views/site/pjjgPage/list.vue
View File

@ -75,6 +75,11 @@
<addModalPage ref="tingKeZuJiAddModal"/>
<viewModalPage ref="viewModal"/>
<fwdtModalPage ref="fwdtModal"/>
<jspjModal ref="jspjModalPage"/>
<xspjModal ref="xspjModalPage"/>
</template>
<script setup lang="ts">
import { ref, onMounted, watch } from 'vue';
@ -85,17 +90,23 @@ import { getUserId, getSysConfig } from '/@/views/site/utils/index';
import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
import fwdtModalPage from '/@/views/site/tingKeZuJi/components/fwdtModal.vue';
import jspjModal from './components/jspjModal.vue';
import xspjModal from './components/xspjModal.vue';
import { defHttp } from '/@/utils/http/axios';
import { tuple } from 'ant-design-vue/lib/_util/type';
// import { tuple } from 'ant-design-vue/lib/_util/type';
enum Api {
// list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
// list = '/qa/kcEvaluation/queryPkZuJiList'
list = '/ktgl/kcKetangbiao/list'
list = '/ktgl/kcKetangbiao/fundAllPjjgList'
}
const tingKeZuJiAddModal = ref();
const viewModal = ref();
const fwdtModal = ref();
const jspjModalPage = ref();
const xspjModalPage = ref();
const current = ref<number>(0);
const total = ref<number>(2);
@ -109,7 +120,6 @@ const props = defineProps({
flagPage: { type:Boolean,default:false}
});
/**
* 列表接口
* @param params
@ -155,12 +165,12 @@ function onSearch() {
//教师评价
function openJspjPage(item) {
jspjModalPage.value.view(item)
}
//学生评价
function openXspjPage(item) {
xspjModalPage.value.view(item)
}
defineExpose({

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

@ -1,6 +1,6 @@
<template>
<div class="renKeJiaoChengBase">
<a-modal :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" :getContainer="getPDom" cancelText="关闭">
<a-modal :z-index="1500" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" :getContainer="getPDom" cancelText="关闭">
<template #title>
<div style="text-align: center;">{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }}节</div>
</template>

2
src/views/site/utils/index.ts
View File

@ -22,7 +22,7 @@ export const getUserId = () => {
return userInfo?.username;
}else{
//固定某值
return '2016900057';//教师//2016900057//2002900176//2001900153
return '2016900057';//教师//2016900057//2002900176//2001900153//1000900273
// return '2022010920';//学生
}
}