From 9fb2baf73bc6837622033234ba32b95e91797de6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 18 Aug 2023 19:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.ts | 6 +++--- .../kc/config/KcExportConfigTpkwcqkjzglx.data.ts | 5 +++++ src/views/kc/kcXqxnHistory/KcXqxnHistory.data.ts | 6 +++--- .../components/KcXqxnHistoryForm.vue | 4 ++-- src/views/kc/kcZzThpjb/KcZzThpjb.data.ts | 2 +- src/views/kc/kcZzXstkb/KcZzXstkb.data.ts | 2 +- src/views/kc/kcZzYbtkb/KcZzYbtkb.data.ts | 2 +- src/views/kc/pktj/pkmxb/pkmxb.data.ts | 5 +++++ src/views/kc/szkc/KcKechengbiaoList.vue | 5 +++-- .../XxhbbkjxtkpjBadLog.data.ts | 2 +- .../XxhbbkjxtkpjBadLogList.vue | 4 ++-- .../XxhbbkjxtkpjGoodLog.data.ts | 5 +++++ .../XxhbbkjxtkpjGoodLogList.vue | 4 ++-- src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts | 4 ++-- src/views/kc/xxhbtkxx/XxhbtkxxList.vue | 4 ++-- src/views/site/kxstkkt/zzsk.vue | 16 ++++++++-------- src/views/site/studentJrkb/index copy.vue | 2 +- src/views/site/tingKeZuJi/more.vue | 2 +- src/views/site/tingKeZuJi/pkMore.vue | 2 +- src/views/site/yuYueKeCheng/more.vue | 2 +- 20 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/main.ts b/src/main.ts index e07403a..584efd7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,7 +16,7 @@ import { setupStore } from '/@/store'; import { setupGlobDirectives } from '/@/directives'; import { setupI18n } from '/@/locales/setupI18n'; import { registerGlobComp } from '/@/components/registerGlobComp'; -// import { registerThirdComp } from '/@/settings/registerThirdComp'; +import { registerThirdComp } from '/@/settings/registerThirdComp'; import { useSso } from '/@/hooks/web/useSso'; // 注册online模块lib import { registerPackages } from '/@/utils/monorepo/registerPackages'; @@ -61,10 +61,10 @@ async function bootstrap() { setupGlobDirectives(app); // 配置全局错误处理 - // setupErrorHandle(app); + setupErrorHandle(app); // 注册第三方组件 - // await registerThirdComp(app); + await registerThirdComp(app); // 当路由准备好时再执行挂载( https://next.router.vuejs.org/api/#isready) await router.isReady(); diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts index 2f8d3a5..5c25060 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts @@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '学年学期', + align: "center", + dataIndex: 'xqxn' + }, { title: '学院', align: "center", diff --git a/src/views/kc/kcXqxnHistory/KcXqxnHistory.data.ts b/src/views/kc/kcXqxnHistory/KcXqxnHistory.data.ts index 0c1cf11..622dabd 100644 --- a/src/views/kc/kcXqxnHistory/KcXqxnHistory.data.ts +++ b/src/views/kc/kcXqxnHistory/KcXqxnHistory.data.ts @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学期学年', + title: '学年学期', align: "center", dataIndex: 'title' }, @@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [ //查询数据 export const searchFormSchema: FormSchema[] = [ { - label: "学期学年", + label: "学年学期", field: 'title', component: 'Input', colProps: {span: 6}, @@ -52,7 +52,7 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '学期学年', + label: '学年学期', field: 'title', component: 'Input', }, diff --git a/src/views/kc/kcXqxnHistory/components/KcXqxnHistoryForm.vue b/src/views/kc/kcXqxnHistory/components/KcXqxnHistoryForm.vue index 328e39f..05862ed 100644 --- a/src/views/kc/kcXqxnHistory/components/KcXqxnHistoryForm.vue +++ b/src/views/kc/kcXqxnHistory/components/KcXqxnHistoryForm.vue @@ -3,8 +3,8 @@ - - + + diff --git a/src/views/kc/kcZzThpjb/KcZzThpjb.data.ts b/src/views/kc/kcZzThpjb/KcZzThpjb.data.ts index 852bece..a3c0d8c 100644 --- a/src/views/kc/kcZzThpjb/KcZzThpjb.data.ts +++ b/src/views/kc/kcZzThpjb/KcZzThpjb.data.ts @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学期学年', + title: '学年学期', align: "center", dataIndex: 'xqxn' }, diff --git a/src/views/kc/kcZzXstkb/KcZzXstkb.data.ts b/src/views/kc/kcZzXstkb/KcZzXstkb.data.ts index fe85c51..51c033d 100644 --- a/src/views/kc/kcZzXstkb/KcZzXstkb.data.ts +++ b/src/views/kc/kcZzXstkb/KcZzXstkb.data.ts @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学期学年', + title: '学年学期', align: "center", dataIndex: 'xqxn' }, diff --git a/src/views/kc/kcZzYbtkb/KcZzYbtkb.data.ts b/src/views/kc/kcZzYbtkb/KcZzYbtkb.data.ts index 864cec3..30f2a82 100644 --- a/src/views/kc/kcZzYbtkb/KcZzYbtkb.data.ts +++ b/src/views/kc/kcZzYbtkb/KcZzYbtkb.data.ts @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学期学年', + title: '学年学期', align: "center", dataIndex: 'xqxn' }, diff --git a/src/views/kc/pktj/pkmxb/pkmxb.data.ts b/src/views/kc/pktj/pkmxb/pkmxb.data.ts index c8e2f14..29fb356 100644 --- a/src/views/kc/pktj/pkmxb/pkmxb.data.ts +++ b/src/views/kc/pktj/pkmxb/pkmxb.data.ts @@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '学年学期', + align: "center", + dataIndex: 'xqxn', + }, { title: '工号', align: "center", diff --git a/src/views/kc/szkc/KcKechengbiaoList.vue b/src/views/kc/szkc/KcKechengbiaoList.vue index 44931b3..38a71a8 100644 --- a/src/views/kc/szkc/KcKechengbiaoList.vue +++ b/src/views/kc/szkc/KcKechengbiaoList.vue @@ -39,8 +39,8 @@ { + console.log(`🚀 ~ file: KcKechengbiaoList.vue:141 ~ list ~ res:`, res) dataSource.value = res?.records??[]; pagination.total = res?.total??0; //如果是隐藏模式，则直接选中 diff --git a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLog.data.ts b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLog.data.ts index 5d53925..188a236 100644 --- a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLog.data.ts +++ b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLog.data.ts @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学期学年', + title: '学年学期', align: "center", dataIndex: 'xqxn' }, diff --git a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLogList.vue b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLogList.vue index c7eb3a3..c435bd7 100644 --- a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLogList.vue +++ b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjBadLogList.vue @@ -5,8 +5,8 @@ - - + + diff --git a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLog.data.ts b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLog.data.ts index c4cf89c..a845373 100644 --- a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLog.data.ts +++ b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLog.data.ts @@ -4,6 +4,11 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '学年学期', + align: "center", + dataIndex: 'xqxn' + }, { title: '编号', align: "center", diff --git a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLogList.vue b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLogList.vue index 6dcd1df..744ef1d 100644 --- a/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLogList.vue +++ b/src/views/kc/xxhbbkjxtkpjBadLog/XxhbbkjxtkpjGoodLogList.vue @@ -5,8 +5,8 @@ - - + + diff --git a/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts b/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts index dd090b2..751e9eb 100644 --- a/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts +++ b/src/views/kc/xxhbtkxx/Xxhbtkxx.data.ts @@ -6,7 +6,7 @@ import { log } from 'console'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学期学年', + title: '学年学期', align: "center", dataIndex: 'xqxn' }, @@ -153,7 +153,7 @@ export const columns: BasicColumn[] = [ //查询数据 export const searchFormSchema: FormSchema[] = [ { - label: "学期学年", + label: "学年学期", field: 'xqxn', component: 'Input', colProps: {span: 6}, diff --git a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue index 67ef68e..664e6fc 100644 --- a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue +++ b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue @@ -5,8 +5,8 @@ - - + + diff --git a/src/views/site/kxstkkt/zzsk.vue b/src/views/site/kxstkkt/zzsk.vue index 050ac72..adb2622 100644 --- a/src/views/site/kxstkkt/zzsk.vue +++ b/src/views/site/kxstkkt/zzsk.vue @@ -93,14 +93,14 @@ function loadData(num?) { pageNo.value = 1 listData.value = []; } - // queryParam.value.pageSize = '4' - // queryParam.value.pageNo = pageNo - // queryParam.value.sfyzhjs = '1' - // queryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',') - // queryParam.value.skrq = queryParam.value.ywTime - // queryParam.value.userid = getUserId() - // queryParam.value.skxs = 1 - // queryParam.value.type = 1 + queryParam.value.pageSize = '4' + queryParam.value.pageNo = pageNo + queryParam.value.sfyzhjs = '1' + queryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',') + queryParam.value.skrq = queryParam.value.ywTime + queryParam.value.userid = getUserId() + queryParam.value.skxs = 1 + queryParam.value.type = 1 queryParam.value.ywskxs = '' console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam) diff --git a/src/views/site/studentJrkb/index copy.vue b/src/views/site/studentJrkb/index copy.vue index a79a81e..85e3778 100644 --- a/src/views/site/studentJrkb/index copy.vue +++ b/src/views/site/studentJrkb/index copy.vue @@ -83,7 +83,7 @@ onMounted(() => { let skrq = formatToDate(new Date()); sjtime.value = skrq sjtitle.value = formatToWeekOne(new Date()); - list({ skrq,userId:getUserId() }).then(res => { + list({ skrq,userid:getUserId() }).then(res => { console.log(`🚀 ~ file: index.vue:83 ~ list ~ res:`, res) listData.value = res?.records; console.log(`🚀 ~ file: index.vue:85 ~ list ~ listData.value:`, listData.value) diff --git a/src/views/site/tingKeZuJi/more.vue b/src/views/site/tingKeZuJi/more.vue index d36736c..105f74d 100644 --- a/src/views/site/tingKeZuJi/more.vue +++ b/src/views/site/tingKeZuJi/more.vue @@ -13,7 +13,7 @@ - +