diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyHuizong.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyHuizong.java index 52bf7f5..d937b1a 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyHuizong.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizong/entity/ZyHuizong.java @@ -91,6 +91,7 @@ public class ZyHuizong implements Serializable { /**作业类型*/ @Excel(name = "作业类型", width = 15) @ApiModelProperty(value = "作业类型") + @Dict(dicCode = "cjlx") private java.lang.String zylx; /**作业占比*/ @Excel(name = "作业占比", width = 15) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/Vkczxzy0002.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/Vkczxzy0002.java index d28a8b7..6b62317 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/Vkczxzy0002.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/Vkczxzy0002.java @@ -136,5 +136,18 @@ public class Vkczxzy0002 implements Serializable { @Dict(dicCode = "zyLeixing") private String zyLeixing; + @Excel(name = "维普查重报告", width = 15) + @ApiModelProperty(value = "维普查重报告") + private String wpccbg; + @Excel(name = "学校查重报告", width = 15) + @ApiModelProperty(value = "学校查重报告") + private String xxccbg; + @Excel(name = "本次查重报告", width = 15) + @ApiModelProperty(value = "本次查重报告") + private String bcccbg; + @Excel(name = "aigc查重报告", width = 15) + @ApiModelProperty(value = "aigc查重报告") + private String aigcccbg; + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/ZyHuizongXiangxi.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/ZyHuizongXiangxi.java index 7be8579..db61a6b 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/ZyHuizongXiangxi.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zyHuizongXiangxi/entity/ZyHuizongXiangxi.java @@ -150,8 +150,24 @@ public class ZyHuizongXiangxi implements Serializable { private java.util.Date khclTime; /**作业类型*/ - @Excel(name = "作业类型", width = 15, dicCode = "zyLeixing") + @Excel(name = "作业类型", width = 15, dicCode = "cjlx") @ApiModelProperty(value = "作业类型") - @Dict(dicCode = "zyLeixing") + @Dict(dicCode = "cjlx") private String zyLeixing; + + @Excel(name = "维普查重报告", width = 15) + @ApiModelProperty(value = "维普查重报告") + private String wpccbg; + @Excel(name = "学校查重报告", width = 15) + @ApiModelProperty(value = "学校查重报告") + private String xxccbg; + @Excel(name = "本次查重报告", width = 15) + @ApiModelProperty(value = "本次查重报告") + private String bcccbg; + @Excel(name = "aigc查重报告", width = 15) + @ApiModelProperty(value = "aigc查重报告") + private String aigcccbg; + + + } diff --git a/jeecgboot-vue3/.env b/jeecgboot-vue3/.env index a3ba918..2015066 100644 --- a/jeecgboot-vue3/.env +++ b/jeecgboot-vue3/.env @@ -2,10 +2,10 @@ VITE_PORT = 3100 # 网站标题 -VITE_GLOB_APP_TITLE = 东北师大-专家督导平台 +VITE_GLOB_APP_TITLE = 东北师范大学专家审核评估平台 # 简称,此变量只能是字符/下划线 -VITE_GLOB_APP_SHORT_NAME = 专家督导平台 +VITE_GLOB_APP_SHORT_NAME = 专家审核评估 # 单点登录服务端地址 VITE_GLOB_APP_CAS_BASE_URL=https://authserver.nenu.edu.cn/authserver diff --git a/jeecgboot-vue3/src/components/Table/src/BasicTable.vue b/jeecgboot-vue3/src/components/Table/src/BasicTable.vue index a49620d..3d03e57 100644 --- a/jeecgboot-vue3/src/components/Table/src/BasicTable.vue +++ b/jeecgboot-vue3/src/components/Table/src/BasicTable.vue @@ -129,6 +129,13 @@ const wrapRef = ref(null); const innerPropsRef = ref>(); + console.log("----------->",props); + const indexColumnProps = { + dataIndex: 'index', + width: '15px', + }; + + // props.indexColumnProps = indexColumnProps; const { prefixCls } = useDesign('basic-table'); const [registerForm, formActions] = useForm(); diff --git a/jeecgboot-vue3/src/hooks/system/useListPage.ts b/jeecgboot-vue3/src/hooks/system/useListPage.ts index c19720a..01074b3 100644 --- a/jeecgboot-vue3/src/hooks/system/useListPage.ts +++ b/jeecgboot-vue3/src/hooks/system/useListPage.ts @@ -255,7 +255,7 @@ export function useListTable(tableProps: TableProps): [ // 是否显示边框 bordered: true, // 是否显示序号列 - showIndexColumn: false, + showIndexColumn: true, // 显示表格设置 showTableSetting: true, // 表格全屏设置 diff --git a/jeecgboot-vue3/src/hooks/web/useTitle.ts b/jeecgboot-vue3/src/hooks/web/useTitle.ts index 0320765..42b979a 100644 --- a/jeecgboot-vue3/src/hooks/web/useTitle.ts +++ b/jeecgboot-vue3/src/hooks/web/useTitle.ts @@ -29,23 +29,24 @@ export function useTitle() { if (route.name === REDIRECT_NAME) { return; } + pageTitle.value = title; // update-begin--author:liaozhiyang---date:20231110---for:【QQYUN-6938】online菜单名字和页面title不一致 - if (route.params && Object.keys(route.params).length) { - if (!menus.value) { - menus.value = await getMenus(); - } - const getTitle = getMatchingRouterName(menus.value, route.fullPath); - let tTitle = ''; - if (getTitle) { - tTitle = t(getTitle); - } else { - tTitle = t(route?.meta?.title as string); - } - pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; - } else { - const tTitle = t(route?.meta?.title as string); - pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; - } + // if (route.params && Object.keys(route.params).length) { + // if (!menus.value) { + // menus.value = await getMenus(); + // } + // const getTitle = getMatchingRouterName(menus.value, route.fullPath); + // let tTitle = ''; + // if (getTitle) { + // tTitle = t(getTitle); + // } else { + // tTitle = t(route?.meta?.title as string); + // } + // pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; + // } else { + // const tTitle = t(route?.meta?.title as string); + // pageTitle.value = tTitle ? ` ${tTitle} - ${title} ` : `${title}`; + // } // update-end--author:liaozhiyang---date:20231110---for:【QQYUN-6938】online菜单名字和页面title不一致 }, { immediate: true } diff --git a/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue b/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue index da40e56..4dac83f 100644 --- a/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue +++ b/jeecgboot-vue3/src/views/bl/kckhcl/KckhclMain.vue @@ -15,8 +15,8 @@ + + diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue index 172f33c..6f27ad7 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/ZyMain.vue @@ -4,10 +4,10 @@ - + - + diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongForm.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongForm.vue index 63b2c12..39053e1 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongForm.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongForm.vue @@ -72,7 +72,6 @@ import { useMessage } from '/@/hooks/web/useMessage'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { getValueType } from '/@/utils'; - import { saveOrUpdate } from '../ZyHuizong.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; const props = defineProps({ @@ -143,59 +142,11 @@ }); } - /** - * 提交数据 - */ - async function submitForm() { - try { - // 触发表单验证 - await validate(); - } catch ({ errorFields }) { - if (errorFields) { - const firstField = errorFields[0]; - if (firstField) { - formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' }); - } - } - return Promise.reject(errorFields); - } - confirmLoading.value = true; - const isUpdate = ref(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, }); diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongModal.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongModal.vue index a252a09..0299591 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongModal.vue +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyHuizongModal.vue @@ -43,7 +43,6 @@ * 确定按钮点击事件 */ function handleOk() { - registerForm.value.submitForm(); } /** diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue new file mode 100644 index 0000000..6f93ac8 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailForm.vue @@ -0,0 +1,395 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailModal.vue b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailModal.vue new file mode 100644 index 0000000..483a053 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyHuizong/components/ZyInfoDetailModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxi.data.ts b/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxi.data.ts index 1273db0..4cf2b02 100644 --- a/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxi.data.ts +++ b/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxi.data.ts @@ -59,7 +59,7 @@ export const columns: BasicColumn[] = [ { title: '作业类型', align: "center", - dataIndex: 'zyLeixing' + dataIndex: 'zyLeixing_dictText' }, { title: '占比(%)', @@ -76,30 +76,34 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'xsxm' }, - // { - // title: '维普检测率', - // align: "center", - // dataIndex: 'wpzyk', - // ifShow: false, - // }, - // { - // title: '学校检测率', - // align: "center", - // dataIndex: 'xxzyk', - // ifShow: false, - // }, - // { - // title: '本次检测率', - // align: "center", - // dataIndex: 'bczyk', - // ifShow: false, - // }, - // { - // title: 'aigc检测率', - // align: "center", - // dataIndex: 'aigc', - // ifShow: false, - // }, + + { + title: '查重率(%)', + align: "center", + dataIndex: 'ccl', + children: [ + { + title: '维普资源库', + align: "center", + dataIndex: 'wpzyk', + }, + { + title: '学校作业库', + align: "center", + dataIndex: 'xxzyk', + }, + { + title: '本次作业库', + align: "center", + dataIndex: 'bczyk', + }, + { + title: 'AIGC', + align: "center", + dataIndex: 'aigc', + }, + ] + }, { title: '作业分数', align: "center", diff --git a/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList2.vue b/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList2.vue new file mode 100644 index 0000000..1242691 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList2.vue @@ -0,0 +1,210 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue index 3625efa..a83ddae 100644 --- a/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue +++ b/jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue @@ -16,7 +16,6 @@ - 查询 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - diff --git a/jeecgboot-vue3/src/views/dashboard/Analysis/index.vue b/jeecgboot-vue3/src/views/dashboard/Analysis/index.vue index 9aa6a1d..51a4d9d 100644 --- a/jeecgboot-vue3/src/views/dashboard/Analysis/index.vue +++ b/jeecgboot-vue3/src/views/dashboard/Analysis/index.vue @@ -1,9 +1,10 @@ diff --git a/jeecgboot-vue3/src/views/system/notice/index.vue b/jeecgboot-vue3/src/views/system/notice/index.vue index dd36947..b78720f 100644 --- a/jeecgboot-vue3/src/views/system/notice/index.vue +++ b/jeecgboot-vue3/src/views/system/notice/index.vue @@ -30,7 +30,7 @@ 编辑 删除 发布 - 详情 + 撤回 diff --git a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue index e731677..cefcc66 100644 --- a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue +++ b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue @@ -1,5 +1,5 @@ @@ -7,7 +7,7 @@ import { ref, unref, toRaw } from 'vue'; import { BasicModal, useModalInner } from '/src/components/Modal'; import { BasicTable, useTable, TableAction } from '/src/components/Table'; - import { userColumns, searchUserFormSchema } from '../role.data'; + import { userColumnsNew, searchUserFormSchemaNew } from '../role.data'; import { expertList } from '../../user/user.api'; // 声明Emits const emit = defineEmits(['select', 'register']); @@ -17,10 +17,10 @@ const [registerTable, { reload }] = useTable({ api: expertList, rowKey: 'id', - columns: userColumns, + columns: userColumnsNew, formConfig: { labelWidth: 60, - schemas: searchUserFormSchema, + schemas: searchUserFormSchemaNew, baseRowStyle: { maxHeight: '20px' }, autoSubmitOnEnter: true, }, diff --git a/jeecgboot-vue3/src/views/system/role/role.data.ts b/jeecgboot-vue3/src/views/system/role/role.data.ts index 6e86cec..c609b81 100644 --- a/jeecgboot-vue3/src/views/system/role/role.data.ts +++ b/jeecgboot-vue3/src/views/system/role/role.data.ts @@ -35,6 +35,25 @@ export const userColumns = [ width: 80, }, ]; + +/** + * 角色用户Columns + */ +export const userColumnsNew = [ + { + title: '专家账号', + dataIndex: 'username', + }, + { + title: '专家姓名', + dataIndex: 'realname', + }, + { + title: '状态', + dataIndex: 'status_dictText', + width: 80, + }, +]; export const searchFormSchema: FormSchema[] = [ { field: 'roleName', @@ -49,6 +68,18 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 6 }, }, ]; +/** + * 角色用户搜索form + */ +export const searchUserFormSchemaNew: FormSchema[] = [ + { + field: 'username', + label: '专家账号', + component: 'Input', + colProps: { span: 12 }, + }, +]; + /** * 角色用户搜索form */