From ea49f784bac4b6459f70ecbb6fda47c655b9dce9 Mon Sep 17 00:00:00 2001 From: lwh <2679599887@qq.com> Date: Fri, 12 May 2023 21:35:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AddCompanyProfileDialog.vue | 7 - .../components/AddTeachingEnvirTypeDialog.vue | 8 +- .../banner/components/AddBannerDialog.vue | 8 +- src/pages/index/banners/banner/index.vue | 1 - .../poster/components/AddPosterDialog.vue | 8 +- .../components/AddContactScancodeDialog.vue | 1 - .../classes/components/AddClassesDialog.vue | 43 +-- .../enrol_aq/components/AddEnrolAqDialog.vue | 7 +- .../AddEnterSchoolProcessDialog.vue | 7 - .../components/AddSignUpProcessDialog.vue | 9 +- .../components/AddinfoArticleDialog.vue | 25 +- .../components/DetailinfoArticleDialog.vue | 5 + .../components/EditinfoArticleDialog.vue | 108 ++----- .../info_article/index.vue | 9 +- .../components/AddinfoArticleTypeDialog.vue | 8 +- .../home_env/components/AddHomeEnvDialog.vue | 27 +- .../components/DetailHomeEnvDialog.vue | 42 ++- .../home_env/components/EditHomeEnvDialog.vue | 68 ++--- .../components/UploadHomeEnvDialog.vue | 10 +- .../components/AddHomeWorksDialog.vue | 9 +- .../index/home_data/home_works/index.vue | 2 +- .../components/AddJointAchievementDialog.vue | 35 +-- .../components/AddAchievementDialog.vue | 7 - .../components/AddSchoolCategoryDialog.vue | 8 +- .../components/AddSchoolLeadersDialog.vue | 1 - .../subject/components/AddSubjectDialog.vue | 8 +- .../teacher/components/AddTeacherDialog.vue | 28 +- .../index/teachers_strength/teacher/index.vue | 2 +- .../index/test/components/AddTestDialog.vue | 166 ---------- .../test/components/DetailTestDialog.vue | 99 ------ .../index/test/components/EditTestDialog.vue | 165 ---------- src/pages/index/test/index.vue | 289 ------------------ .../works_list/components/AddWorksDialog.vue | 11 +- .../components/AddWorksTypeDialog.vue | 7 - 34 files changed, 168 insertions(+), 1070 deletions(-) delete mode 100644 src/pages/index/test/components/AddTestDialog.vue delete mode 100644 src/pages/index/test/components/DetailTestDialog.vue delete mode 100644 src/pages/index/test/components/EditTestDialog.vue delete mode 100644 src/pages/index/test/index.vue diff --git a/src/pages/index/about_us/company_profile/components/AddCompanyProfileDialog.vue b/src/pages/index/about_us/company_profile/components/AddCompanyProfileDialog.vue index 43a3a1b..a184c36 100644 --- a/src/pages/index/about_us/company_profile/components/AddCompanyProfileDialog.vue +++ b/src/pages/index/about_us/company_profile/components/AddCompanyProfileDialog.vue @@ -81,7 +81,6 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - company_profile_order: 0 }); const uoloadData = ref({ @@ -105,12 +104,6 @@ const rules = reactive({ message: '简介内容不能为空' } ], - company_profile_order: [ - { - required: true, - message: '简介排序不能为空' - } - ], company_profile_color: [ { required: true, diff --git a/src/pages/index/about_us/teaching_envir/teaching_envir_type/components/AddTeachingEnvirTypeDialog.vue b/src/pages/index/about_us/teaching_envir/teaching_envir_type/components/AddTeachingEnvirTypeDialog.vue index 7137f2b..7400f22 100644 --- a/src/pages/index/about_us/teaching_envir/teaching_envir_type/components/AddTeachingEnvirTypeDialog.vue +++ b/src/pages/index/about_us/teaching_envir/teaching_envir_type/components/AddTeachingEnvirTypeDialog.vue @@ -78,7 +78,6 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - teaching_envir_type_order: 0, teaching_envir_type_parent_guid: '0', }); @@ -97,12 +96,7 @@ const rules = reactive({ message: '环境类型名称不能为空' } ], - teaching_envir_type_order: [ - { - required: true, - message: '环境类型排序不能为空' - } - ], + }); diff --git a/src/pages/index/banners/banner/components/AddBannerDialog.vue b/src/pages/index/banners/banner/components/AddBannerDialog.vue index 495d804..21d038a 100644 --- a/src/pages/index/banners/banner/components/AddBannerDialog.vue +++ b/src/pages/index/banners/banner/components/AddBannerDialog.vue @@ -75,7 +75,6 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - banner_order: 1 }); const uoloadData = ref({ @@ -99,12 +98,7 @@ const rules = reactive({ // message: '轮播图片位置(字典)不能为空' // } // ], - banner_order: [ - { - required: true, - message: '排序不能为空' - } - ], + }); diff --git a/src/pages/index/banners/banner/index.vue b/src/pages/index/banners/banner/index.vue index 98c256a..db543ad 100644 --- a/src/pages/index/banners/banner/index.vue +++ b/src/pages/index/banners/banner/index.vue @@ -179,7 +179,6 @@ async function handleEditOrder(data) { if (code == 0) { loading.value = false tableRef.value.reload() - ElMessage.success(msg); } else { ElMessage.error(msg); } diff --git a/src/pages/index/banners/poster/components/AddPosterDialog.vue b/src/pages/index/banners/poster/components/AddPosterDialog.vue index 86fb327..ddde69b 100644 --- a/src/pages/index/banners/poster/components/AddPosterDialog.vue +++ b/src/pages/index/banners/poster/components/AddPosterDialog.vue @@ -85,7 +85,7 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - poster_sort: 1 + // poster_sort: 1 }); const uoloadData = ref({ @@ -121,12 +121,6 @@ const rules = reactive({ message: '描述不能为空' } ], - poster_sort: [ - { - required: true, - message: '排序不能为空' - } - ], }); diff --git a/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue b/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue index ecec245..7a7a7ad 100644 --- a/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue +++ b/src/pages/index/contact_us/contact_info/contact_scancode/components/AddContactScancodeDialog.vue @@ -68,7 +68,6 @@ const props = defineProps({ const emits = defineEmits(['update:modelValue']); const dialogVisible = ref(props.modelValue); const formData = reactive({ - contact_scancode_order: 1 }); const uoloadData = ref({ diff --git a/src/pages/index/enrol/classes/components/AddClassesDialog.vue b/src/pages/index/enrol/classes/components/AddClassesDialog.vue index 5e1f54f..b93e82b 100644 --- a/src/pages/index/enrol/classes/components/AddClassesDialog.vue +++ b/src/pages/index/enrol/classes/components/AddClassesDialog.vue @@ -15,6 +15,17 @@ :drag='true' :isShowTip='false' /> + + + + + + + + + + @@ -25,27 +36,6 @@ - - - - - - - - - - - - @@ -61,7 +51,7 @@ - + diff --git a/src/pages/index/home_data/home_env/components/EditHomeEnvDialog.vue b/src/pages/index/home_data/home_env/components/EditHomeEnvDialog.vue index e2f6dfd..d081fc1 100644 --- a/src/pages/index/home_data/home_env/components/EditHomeEnvDialog.vue +++ b/src/pages/index/home_data/home_env/components/EditHomeEnvDialog.vue @@ -2,20 +2,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -30,7 +30,7 @@ - + diff --git a/src/pages/index/home_data/home_env/components/UploadHomeEnvDialog.vue b/src/pages/index/home_data/home_env/components/UploadHomeEnvDialog.vue index f28653c..9825a0a 100644 --- a/src/pages/index/home_data/home_env/components/UploadHomeEnvDialog.vue +++ b/src/pages/index/home_data/home_env/components/UploadHomeEnvDialog.vue @@ -53,9 +53,7 @@ const props = defineProps({ }); const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); -const formData = reactive({ - home_env_sort: 1 -}); +const formData = reactive({}); const uoloadData = ref({ dirName: "HomeEnv" @@ -100,10 +98,10 @@ const handleAddClick = async (formEl) => { const { code } = await batchAddHomeEnv(formData); if (code == 0) { - // closeDialog(); - // props.done(); + closeDialog(); + props.done(); } - isBtnLod.value = flase; + isBtnLod.value = false; }); }; diff --git a/src/pages/index/home_data/home_works/components/AddHomeWorksDialog.vue b/src/pages/index/home_data/home_works/components/AddHomeWorksDialog.vue index 676f395..a8fbb8b 100644 --- a/src/pages/index/home_data/home_works/components/AddHomeWorksDialog.vue +++ b/src/pages/index/home_data/home_works/components/AddHomeWorksDialog.vue @@ -81,7 +81,7 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - home_works_sort: 1 + // home_works_sort: 1 }); const uoloadData = ref({ @@ -105,12 +105,7 @@ const rules = reactive({ message: '图片不能为空' } ], - home_works_sort: [ - { - required: true, - message: '排序不能为空' - } - ], + }); diff --git a/src/pages/index/home_data/home_works/index.vue b/src/pages/index/home_data/home_works/index.vue index 2ca881c..9703cca 100644 --- a/src/pages/index/home_data/home_works/index.vue +++ b/src/pages/index/home_data/home_works/index.vue @@ -105,7 +105,7 @@ import { ArrowDown } from '@element-plus/icons-vue'; import { ref, reactive, watch } from 'vue'; import { useLoginStore } from "~/store"; -import { getHomeWorksList, deleteHomeWorks, getDictionary, exportExcel } from '~/service/home_works'; +import { getHomeWorksList, editHomeWorks , deleteHomeWorks, getDictionary, exportExcel } from '~/service/home_works'; import AddHomeWorksDialog from './components/AddHomeWorksDialog.vue'; import EditHomeWorksDialog from './components/EditHomeWorksDialog.vue'; import DetailHomeWorksDialog from './components/DetailHomeWorksDialog.vue'; diff --git a/src/pages/index/honorary_achievement/joint_achievement/components/AddJointAchievementDialog.vue b/src/pages/index/honorary_achievement/joint_achievement/components/AddJointAchievementDialog.vue index 3a27df5..534c541 100644 --- a/src/pages/index/honorary_achievement/joint_achievement/components/AddJointAchievementDialog.vue +++ b/src/pages/index/honorary_achievement/joint_achievement/components/AddJointAchievementDialog.vue @@ -18,7 +18,14 @@ - + + + + + + @@ -26,22 +33,7 @@ - - - - - - - + @@ -56,7 +48,7 @@ - - diff --git a/src/pages/index/test/components/DetailTestDialog.vue b/src/pages/index/test/components/DetailTestDialog.vue deleted file mode 100644 index 3eac933..0000000 --- a/src/pages/index/test/components/DetailTestDialog.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - diff --git a/src/pages/index/test/components/EditTestDialog.vue b/src/pages/index/test/components/EditTestDialog.vue deleted file mode 100644 index edd9a70..0000000 --- a/src/pages/index/test/components/EditTestDialog.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - - diff --git a/src/pages/index/test/index.vue b/src/pages/index/test/index.vue deleted file mode 100644 index 30650ca..0000000 --- a/src/pages/index/test/index.vue +++ /dev/null @@ -1,289 +0,0 @@ - - diff --git a/src/pages/index/works/works_list/components/AddWorksDialog.vue b/src/pages/index/works/works_list/components/AddWorksDialog.vue index adf835d..583139c 100644 --- a/src/pages/index/works/works_list/components/AddWorksDialog.vue +++ b/src/pages/index/works/works_list/components/AddWorksDialog.vue @@ -42,7 +42,7 @@ - + @@ -112,8 +112,7 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - works_order: 1, - works_likes_count: 0, + works_likes_count: 0 }); const uoloadData = ref({ @@ -149,12 +148,6 @@ const rules = reactive({ message: '作品点赞数不能为空' } ], - works_order: [ - { - required: true, - message: '排序不能为空' - } - ], works_author_type: [ { required: true, diff --git a/src/pages/index/works/works_type/components/AddWorksTypeDialog.vue b/src/pages/index/works/works_type/components/AddWorksTypeDialog.vue index 69e985e..bf53e1b 100644 --- a/src/pages/index/works/works_type/components/AddWorksTypeDialog.vue +++ b/src/pages/index/works/works_type/components/AddWorksTypeDialog.vue @@ -81,7 +81,6 @@ const props = defineProps({ const emits = defineEmits(["update:modelValue"]); const dialogVisible = ref(props.modelValue); const formData = reactive({ - works_type_order: 0, works_type_parent_guid: '0', }); @@ -100,12 +99,6 @@ const rules = reactive({ message: '作品类型名称不能为空' } ], - works_type_order: [ - { - required: true, - message: '作品类型排序不能为空' - } - ], });