修改新功能

This commit is contained in:
yangjun 2024-07-27 16:12:11 +08:00
parent 28f2b12fca
commit d3fc6ffb51
11 changed files with 1716 additions and 531 deletions

View File

@ -120,7 +120,7 @@ const baseApiUrl = globSetting.domainUrl;
function getCctype(record,type){ function getCctype(record,type){
var text="-"; var text="-";
if(type=='1'){ if(type=='1'){
if(record.wwcc=='1'){ if(record.wwcc=='true'){
if(record.wwxsl){ if(record.wwxsl){
text = record.wwxsl+"%"; text = record.wwxsl+"%";
}else if(record.wwsftg&&record.wwsftg.indexOf("失败")!=-1){ }else if(record.wwsftg&&record.wwsftg.indexOf("失败")!=-1){
@ -134,7 +134,7 @@ const baseApiUrl = globSetting.domainUrl;
text = "不查重"; text = "不查重";
} }
}else if(type=='2'){ }else if(type=='2'){
if(record.nwcc=='1'){ if(record.nwcc=='true'){
if(record.nwxsl){ if(record.nwxsl){
text = record.nwxsl+"%"; text = record.nwxsl+"%";
}else if(record.nwsftg&&record.nwsftg.indexOf("失败")!=-1){ }else if(record.nwsftg&&record.nwsftg.indexOf("失败")!=-1){
@ -148,7 +148,7 @@ const baseApiUrl = globSetting.domainUrl;
text = "不查重"; text = "不查重";
} }
}else if(type=='3'){ }else if(type=='3'){
if(record.aigccc=='1'){ if(record.aigccc=='true'){
if(record.aigcxsl){ if(record.aigcxsl){
text = record.aigcxsl+"%"; text = record.aigcxsl+"%";
}else if(record.aigcsftg&&record.aigcsftg.indexOf("失败")!=-1){ }else if(record.aigcsftg&&record.aigcsftg.indexOf("失败")!=-1){
@ -162,7 +162,7 @@ const baseApiUrl = globSetting.domainUrl;
text = "不查重"; text = "不查重";
} }
}else if(type=='4'){ }else if(type=='4'){
if(record.xncc=='1'){ if(record.xncc=='true'){
if(record.xnxsl){ if(record.xnxsl){
text = record.xnxsl+"%"; text = record.xnxsl+"%";
}else if(record.xnsftg&&record.xnsftg.indexOf("失败")!=-1){ }else if(record.xnsftg&&record.xnsftg.indexOf("失败")!=-1){

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,72 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/teachingunitcontent/kcTeachingUnitContentOne/getAllList',
save='/teachingunitcontent/kcTeachingUnitContentOne/add',
edit='/teachingunitcontent/kcTeachingUnitContentOne/edit',
deleteOne = '/teachingunitcontent/kcTeachingUnitContentOne/delete',
deleteBatch = '/teachingunitcontent/kcTeachingUnitContentOne/deleteBatch',
importExcel = '/teachingunitcontent/kcTeachingUnitContentOne/importExcel',
exportXls = '/teachingunitcontent/kcTeachingUnitContentOne/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
*
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
* @param handleSuccess
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}

View File

@ -0,0 +1,57 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '章次',
align: "center",
dataIndex: 'title'
},
{
title: '节次',
align: "center",
dataIndex: 'twoTitle'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '学期学年',
field: 'xqxn',
component: 'Input',
},
{
label: '任务编号',
field: 'rwbh',
component: 'Input',
},
{
label: '标题',
field: 'title',
component: 'Input',
},
{
label: '排序',
field: 'sort',
component: 'InputNumber',
},
{
label: '发布0未发布1已发布',
field: 'fabu',
component: 'Input',
},
// TODO 主键隐藏字段目前写死为ID
{
label: '',
field: 'id',
component: 'Input',
show: false,
},
];

View File

@ -0,0 +1,223 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 确认</a-button>
<!-- <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 }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
</template>
<!--字段回显插槽-->
<template #htmlSlot="{ text }">
<div v-html="text"></div>
</template>
<!--省市区字段回显插槽-->
<!--<template #pcaSlot="{text}">
{{ getAreaTextByCode(text) }}
</template>-->
<template #fileSlot="{ text }">
<span v-if="!text" style="font-size: 12px; font-style: italic">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<KcTeachingUnitContentOneModal ref="registerModal" @success="handleSuccess"></KcTeachingUnitContentOneModal>
</div>
</template>
<script lang="ts" name="kcTeachingUnitContentOne-kcTeachingUnitContentOne" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns } from './KcTeachingUnitContentOne.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcTeachingUnitContentOne.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import KcTeachingUnitContentOneModal from './components/KcTeachingUnitContentOneModal.vue';
const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const emit = defineEmits(['register', 'ok']);
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: 'kc_teaching_unit_content_one',
api: list,
columns,
canResize: false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
showActionColumn: false,
beforeFetch: (params) => {
(params.column = ''), (params.order = ''); //
return Object.assign(params, queryParam.value);
},
},
exportConfig: {
name: 'kc_teaching_unit_content_one',
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
tableContext;
const labelCol = reactive({
xs: { span: 24 },
sm: { span: 7 },
});
const wrapperCol = reactive({
xs: { span: 24 },
sm: { span: 16 },
});
/**
* 新增事件
*/
function handleAdd() {
var ids = selectedRowKeys.value;
console.log('😘', ids);
emit('ok',ids);
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
];
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
queryParam.value = {};
selectedRowKeys.value = [];
//
reload();
}
function init(record) {
console.log('🥼', record);
queryParam.value = record;
reload();
}
defineExpose({
init,
});
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust {
width: calc(50% - 15px);
min-width: 100px !important;
}
.query-group-split-cust {
width: 30px;
display: inline-block;
text-align: center;
}
}
</style>

View File

@ -0,0 +1,75 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<KcTeachingUnitContentOneList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></KcTeachingUnitContentOneList>
</a-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import KcTeachingUnitContentOneList from './KcTeachingUnitContentOneList.vue'
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function init(record) {
title.value = '选择章次节次';
visible.value = true;
nextTick(() => {
registerForm.value.init(record);
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback(record) {
handleCancel();
emit('success',record);
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
init,
edit,
disableSubmit,
});
</script>
<style>
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>

View File

@ -0,0 +1,151 @@
<template>
<a-spin :spinning="confirmLoading">
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="24">
<a-form-item label="学期学年" v-bind="validateInfos.xqxn">
<a-input v-model:value="formData.xqxn" placeholder="请输入学期学年" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="任务编号" v-bind="validateInfos.rwbh">
<a-input v-model:value="formData.rwbh" placeholder="请输入任务编号" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="标题" v-bind="validateInfos.title">
<a-input v-model:value="formData.title" placeholder="请输入标题" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="排序" v-bind="validateInfos.sort">
<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" :disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="发布0未发布1已发布" v-bind="validateInfos.fabu">
<a-input v-model:value="formData.fabu" placeholder="请输入发布0未发布1已发布" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../KcTeachingUnitContentOne.api';
import { Form } from 'ant-design-vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: ()=>{} },
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
xqxn: '',
rwbh: '',
title: '',
sort: undefined,
fabu: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
//
Object.assign(formData, record);
});
}
/**
* 提交数据
*/
async function submitForm() {
//
await validate();
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//
for (let data in model) {
//
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
min-height: 500px !important;
overflow-y: auto;
padding: 24px 24px 24px 24px;
}
</style>

View File

@ -0,0 +1,75 @@
<template>
<a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<KcTeachingUnitContentOneForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></KcTeachingUnitContentOneForm>
</a-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import KcTeachingUnitContentOneForm from './KcTeachingUnitContentOneForm.vue'
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style>
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>

View File

@ -37,6 +37,7 @@ export const getImportUrl = Api.importExcel;
* @param params * @param params
*/ */
export const list = (params) => defHttp.get({ url: Api.list, params }); export const list = (params) => defHttp.get({ url: Api.list, params });
export const newlist = (params) => defHttp.get({ url: Api.list, params });
export const stuList = (params) => defHttp.get({ url: Api.stuList, params }); export const stuList = (params) => defHttp.get({ url: Api.stuList, params });
export const stuKccyList = (params) => defHttp.get({ url: Api.stuKccyList, params }); export const stuKccyList = (params) => defHttp.get({ url: Api.stuKccyList, params });
export const cdxxlist = (params) => defHttp.get({ url: Api.cdxxlist, params }); export const cdxxlist = (params) => defHttp.get({ url: Api.cdxxlist, params });

View File

@ -66,6 +66,80 @@ export const columns: BasicColumn[] = [
]; ];
//列表数据
export const newcolumns: BasicColumn[] = [
{
title: '学生姓名',
align: "center",
dataIndex: 'studentName',
sorter: true,
},
{
title: '学生学号',
align: "center",
dataIndex: 'createBy',
sorter: true,
},
// {
// title: '学生评分',
// align: "center",
// dataIndex: 'publishTime',
// sorter: true,
// },
{
title: '教师评分',
align: "center",
dataIndex: 'score',
sorter: true,
},
{
title: '最高查重率',
align: "center",
dataIndex: 'zgccl',
sorter: true,
slots: { customRender: 'zgcclaction' },
},
// {
// title: '网络查重',
// align: "center",
// dataIndex: 'wwsftg',
// slots: { customRender: 'wwsftgaction' },
// sorter: true,
// },
// {
// title: '作业查重',
// align: "center",
// dataIndex: 'nwsftg',
// slots: { customRender: 'nwsftgaction' },
// sorter: true,
// },
// {
// title: 'Aigc查重',
// align: "center",
// dataIndex: 'aigcsftg',
// slots: { customRender: 'aigcsftgaction' },
// sorter: true,
// },
// {
// title: '校内查重',
// align: "center",
// dataIndex: 'xnsftg',
// slots: { customRender: 'xnsftgaction' },
// sorter: true,
// },
{
title: '标记作业',
align: "center",
dataIndex: 'cdlx_dictText',
sorter: true,
},
];
//列表数据 //列表数据
export const columnsStu: BasicColumn[] = [ export const columnsStu: BasicColumn[] = [
{ {

View File

@ -29,20 +29,6 @@
<!--引用表格--> <!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection" style="margin-top:-20px;"> <BasicTable @register="registerTable" :rowSelection="rowSelection" style="margin-top:-20px;">
<template #tableTitle> <template #tableTitle>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleFabu">
<Icon icon="ant-design:delete-outlined"></Icon>
发布评分
</a-menu-item>
</a-menu>
</template>
<a-button type="primary">批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown> -->
<a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleFabu" style="margin-left: 8px"> 一键发布评分</a-button> <a-button type="primary" preIcon="ant-design:export-outlined" @click="batchHandleFabu" style="margin-left: 8px"> 一键发布评分</a-button>
<span style="font-size: 16px;">温馨提醒发布评分后可以在操作列进行<span style="color:red;font-weight:700;">存档类型设置样本</span>操作 <span style="font-size: 16px;">温馨提醒发布评分后可以在操作列进行<span style="color:red;font-weight:700;">存档类型设置样本</span>操作
非高峰期预计30分钟内返回<span style="color:blue;font-weight:700;">检测结果</span>高峰期预计时间会更长请您耐心等待 非高峰期预计30分钟内返回<span style="color:blue;font-weight:700;">检测结果</span>高峰期预计时间会更长请您耐心等待
@ -129,17 +115,6 @@
</template> </template>
</span> </span>
</template> </template>
<!--<template #pcaSlot="{text}">
{{ getAreaTextByCode(text) }}
</template>-->
<!-- <template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template> -->
<!-- <template #fileZxSlot="{text,record}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="yulanFile(text)">预览</a-button>
</template> -->
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->
<ZyInfoStudentModal ref="registerModal" @success="handleSuccess"></ZyInfoStudentModal> <ZyInfoStudentModal ref="registerModal" @success="handleSuccess"></ZyInfoStudentModal>